diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-22 02:32:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-22 02:32:24 -0400 |
| commit | d3c6e7ad09cebbad1a3dea077668062136626fd2 (patch) | |
| tree | 698022508a8d8c76a5d2cf55e50232079d6b1f42 /drivers/net/Makefile | |
| parent | c3227e546c574172e77616270a16a04eae561b8f (diff) | |
| parent | 48d3ff82698cb0094684aed70446e0a5cbb1a4d0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 0b371083d481..f34b3baf7ee6 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -245,6 +245,7 @@ obj-$(CONFIG_MYRI10GE) += myri10ge/ | |||
| 245 | obj-$(CONFIG_SMC91X) += smc91x.o | 245 | obj-$(CONFIG_SMC91X) += smc91x.o |
| 246 | obj-$(CONFIG_SMC911X) += smc911x.o | 246 | obj-$(CONFIG_SMC911X) += smc911x.o |
| 247 | obj-$(CONFIG_SMSC911X) += smsc911x.o | 247 | obj-$(CONFIG_SMSC911X) += smsc911x.o |
| 248 | obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o | ||
| 248 | obj-$(CONFIG_BFIN_MAC) += bfin_mac.o | 249 | obj-$(CONFIG_BFIN_MAC) += bfin_mac.o |
| 249 | obj-$(CONFIG_DM9000) += dm9000.o | 250 | obj-$(CONFIG_DM9000) += dm9000.o |
| 250 | obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o | 251 | obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o |