aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/Makefile
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-08-03 06:17:13 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-08-27 03:58:36 -0400
commitb5451d783ade99308dfccdf5ca284ed07affa4ff (patch)
tree98830cee17e38f3351bb3f1cc839ee3c29ec68a3 /drivers/net/Makefile
parent18e635f4b3e1e1b43cb239321f6120918ba38d46 (diff)
slip: Move the SLIP drivers
Move the Serial Line Internet Protocol (SLIP) drivers into drivers/net/slip/ and make the necessary Kconfig and Makefile changes. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Acked-by: Alan Cox <alan@linux.intel.com>
Diffstat (limited to 'drivers/net/Makefile')
-rw-r--r--drivers/net/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 52dae95d4ea6..e6a183efc71e 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -20,8 +20,6 @@ obj-$(CONFIG_RIONET) += rionet.o
20 20
21obj-$(CONFIG_NET) += Space.o loopback.o 21obj-$(CONFIG_NET) += Space.o loopback.o
22obj-$(CONFIG_NET_SB1000) += sb1000.o 22obj-$(CONFIG_NET_SB1000) += sb1000.o
23obj-$(CONFIG_SLIP) += slip.o
24obj-$(CONFIG_SLHC) += slhc.o
25 23
26obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o 24obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
27obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/ 25obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/
@@ -48,6 +46,8 @@ obj-$(CONFIG_PPP_SYNC_TTY) += ppp/
48obj-$(CONFIG_PPPOE) += ppp/ 46obj-$(CONFIG_PPPOE) += ppp/
49obj-$(CONFIG_PPPOL2TP) += ppp/ 47obj-$(CONFIG_PPPOL2TP) += ppp/
50obj-$(CONFIG_PPTP) += ppp/ 48obj-$(CONFIG_PPTP) += ppp/
49onj-$(CONFIG_SLIP) += slip/
50obj-$(CONFIG_SLHC) += slip/
51obj-$(CONFIG_TR) += tokenring/ 51obj-$(CONFIG_TR) += tokenring/
52obj-$(CONFIG_WAN) += wan/ 52obj-$(CONFIG_WAN) += wan/
53obj-$(CONFIG_ARCNET) += arcnet/ 53obj-$(CONFIG_ARCNET) += arcnet/