diff --git a/[refs] b/[refs]
index 31df7d5d8139..880713c6ed3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 728a98b831eecada40b36df53420d57e9292c880
+refs/heads/master: 5cbba3cd9db44d171673405d71b9aa0e35accdd1
diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
index cd353008b27d..fa877cd2b139 100644
--- a/trunk/drivers/net/Makefile
+++ b/trunk/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/