git://git.onelab.eu
/
linux-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
106fedb
)
bring in sync with fedora-2_6_20-1_2949_fc6_vs2_2_0_1
author
Marc Fiuczynski
<mef@cs.princeton.edu>
Fri, 29 Jun 2007 03:14:45 +0000
(
03:14
+0000)
committer
Marc Fiuczynski
<mef@cs.princeton.edu>
Fri, 29 Jun 2007 03:14:45 +0000
(
03:14
+0000)
drivers/net/Makefile
patch
|
blob
|
history
diff --git
a/drivers/net/Makefile
b/drivers/net/Makefile
index
cfd74b5
..
4c0d4e5
100644
(file)
--- a/
drivers/net/Makefile
+++ b/
drivers/net/Makefile
@@
-2,10
+2,6
@@
# Makefile for the Linux network (ethercard) device drivers.
#
# Makefile for the Linux network (ethercard) device drivers.
#
-ifeq ($(CONFIG_ISDN_PPP),y)
- obj-$(CONFIG_ISDN) += slhc.o
-endif
-
obj-$(CONFIG_E1000) += e1000/
obj-$(CONFIG_IBM_EMAC) += ibm_emac/
obj-$(CONFIG_IXGB) += ixgb/
obj-$(CONFIG_E1000) += e1000/
obj-$(CONFIG_IBM_EMAC) += ibm_emac/
obj-$(CONFIG_IXGB) += ixgb/