Merge branch 'linus' into tracing/mmiotrace-mergefixups
[linux-2.6] / drivers / net / atlx / Makefile
1 obj-$(CONFIG_ATL1)      += atl1.o