projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
728a98b
)
net: Fix duplicate CONFIG_SLIP entry in driver/net/Makefile
author
David S. Miller
<davem@davemloft.net>
Tue, 30 Aug 2011 02:55:53 +0000
(22:55 -0400)
committer
David S. Miller
<davem@davemloft.net>
Tue, 30 Aug 2011 02:55:53 +0000
(22:55 -0400)
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/Makefile
patch
|
blob
|
history
diff --git
a/drivers/net/Makefile
b/drivers/net/Makefile
index
cd35300
..
fa877cd
100644
(file)
--- a/
drivers/net/Makefile
+++ b/
drivers/net/Makefile
@@
-47,7
+47,6
@@
obj-$(CONFIG_PPTP) += ppp/
obj-$(CONFIG_SLIP) += slip/
obj-$(CONFIG_SLHC) += slip/
obj-$(CONFIG_NET_SB1000) += sb1000.o
-obj-$(CONFIG_SLIP) += slip/
obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o
obj-$(CONFIG_TR) += tokenring/
obj-$(CONFIG_WAN) += wan/