summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-08-29 22:55:53 -0400
committerDavid S. Miller <davem@davemloft.net>2011-08-29 22:55:53 -0400
commit5cbba3cd9db44d171673405d71b9aa0e35accdd1 (patch)
tree1215970d979122a08563e98966b06e66ce274c19 /drivers
parent728a98b831eecada40b36df53420d57e9292c880 (diff)
downloadop-kernel-dev-5cbba3cd9db44d171673405d71b9aa0e35accdd1.zip
op-kernel-dev-5cbba3cd9db44d171673405d71b9aa0e35accdd1.tar.gz
net: Fix duplicate CONFIG_SLIP entry in driver/net/Makefile
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index cd35300..fa877cd 100644
--- 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/
OpenPOWER on IntegriCloud