diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-17 21:37:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-17 21:37:14 -0700 |
| commit | 5bbc1722d52ad3df062d5742a7e958276e57ebd7 (patch) | |
| tree | 8aa544f9a8623fba2fae933819627ceb839eac1f /drivers/net/Makefile | |
| parent | 30902dc3cb0ea1cfc7ac2b17bcf478ff98420d74 (diff) | |
| parent | ae7b6487ec9c2e2a1551b9d291aa0dbbe0addf48 (diff) | |
Merge branch 'davem-next' 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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index c96fe203680..c9faa460590 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -4,7 +4,6 @@ obj-$(CONFIG_E1000) += e1000/ obj-$(CONFIG_E1000E) += e1000e/ -obj-$(CONFIG_IBM_EMAC) += ibm_emac/ obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/ obj-$(CONFIG_IGB) += igb/ obj-$(CONFIG_IXGBE) += ixgbe/ |