diff options
author | David S. Miller <davem@davemloft.net> | 2011-08-29 22:55:53 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-08-29 22:55:53 -0400 |
commit | 5cbba3cd9db44d171673405d71b9aa0e35accdd1 (patch) | |
tree | 1215970d979122a08563e98966b06e66ce274c19 /drivers/net/Makefile | |
parent | 728a98b831eecada40b36df53420d57e9292c880 (diff) |
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/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 cd353008b27d..fa877cd2b139 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
@@ -47,7 +47,6 @@ obj-$(CONFIG_PPTP) += ppp/ | |||
47 | obj-$(CONFIG_SLIP) += slip/ | 47 | obj-$(CONFIG_SLIP) += slip/ |
48 | obj-$(CONFIG_SLHC) += slip/ | 48 | obj-$(CONFIG_SLHC) += slip/ |
49 | obj-$(CONFIG_NET_SB1000) += sb1000.o | 49 | obj-$(CONFIG_NET_SB1000) += sb1000.o |
50 | obj-$(CONFIG_SLIP) += slip/ | ||
51 | obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o | 50 | obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o |
52 | obj-$(CONFIG_TR) += tokenring/ | 51 | obj-$(CONFIG_TR) += tokenring/ |
53 | obj-$(CONFIG_WAN) += wan/ | 52 | obj-$(CONFIG_WAN) += wan/ |