diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-19 15:51:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-19 15:51:35 -0700 |
| commit | 79b6f7ecdac7a37df72a5f354816c0dd0b6ac592 (patch) | |
| tree | cb709af3ca7425768a596df97ccafbd6b8397d1d /drivers/net/Makefile | |
| parent | 02a1416478b70cd49bd74827438c8ba797784728 (diff) | |
| parent | c4e84bde1d595d857d3c74b49b9c45cc770df792 (diff) | |
Merge branch 'new-drivers' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index f66b79bd3b8..fa2510b2e60 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -15,9 +15,12 @@ obj-$(CONFIG_EHEA) += ehea/ obj-$(CONFIG_CAN) += can/ obj-$(CONFIG_BONDING) += bonding/ obj-$(CONFIG_ATL1) += atlx/ +obj-$(CONFIG_ATL2) += atlx/ obj-$(CONFIG_ATL1E) += atl1e/ obj-$(CONFIG_GIANFAR) += gianfar_driver.o obj-$(CONFIG_TEHUTI) += tehuti.o +obj-$(CONFIG_ENIC) += enic/ +obj-$(CONFIG_JME) += jme.o gianfar_driver-objs := gianfar.o \ gianfar_ethtool.o \ @@ -128,6 +131,7 @@ obj-$(CONFIG_AX88796) += ax88796.o obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o obj-$(CONFIG_QLA3XXX) += qla3xxx.o +obj-$(CONFIG_QLGE) += qlge/ obj-$(CONFIG_PPP) += ppp_generic.o obj-$(CONFIG_PPP_ASYNC) += ppp_async.o |