diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-18 09:57:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-18 09:57:02 +0100 |
| commit | 37ba317c9ed19eb126e40bbf563f2711e191a636 (patch) | |
| tree | c5865768f341fc0ab41899fe9af9dc5918784cee /drivers/net/Makefile | |
| parent | 708dc5125309cd33c5daaad3026cc4ae6ef39c8b (diff) | |
| parent | ee568b25ee9e160b32d1aef73d8b2ee9c05d34db (diff) | |
Merge branches 'sched/cleanups' and 'linus' into sched/core
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index aca8492db65..471baaff229 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -22,6 +22,7 @@ obj-$(CONFIG_GIANFAR) += gianfar_driver.o obj-$(CONFIG_TEHUTI) += tehuti.o obj-$(CONFIG_ENIC) += enic/ obj-$(CONFIG_JME) += jme.o +obj-$(CONFIG_BE2NET) += benet/ gianfar_driver-objs := gianfar.o \ gianfar_ethtool.o \ @@ -231,6 +232,7 @@ obj-$(CONFIG_ENC28J60) += enc28j60.o obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o +obj-$(CONFIG_DNET) += dnet.o obj-$(CONFIG_MACB) += macb.o obj-$(CONFIG_ARM) += arm/ |