diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-03 03:17:13 -0700 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-27 00:58:36 -0700 |
commit | b5451d783ade99308dfccdf5ca284ed07affa4ff (patch) | |
tree | 98830cee17e38f3351bb3f1cc839ee3c29ec68a3 /drivers/net/Makefile | |
parent | 18e635f4b3e1e1b43cb239321f6120918ba38d46 (diff) | |
download | linux-3.10-b5451d783ade99308dfccdf5ca284ed07affa4ff.tar.gz linux-3.10-b5451d783ade99308dfccdf5ca284ed07affa4ff.tar.bz2 linux-3.10-b5451d783ade99308dfccdf5ca284ed07affa4ff.zip |
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/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 52dae95d4ea..e6a183efc71 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -20,8 +20,6 @@ obj-$(CONFIG_RIONET) += rionet.o obj-$(CONFIG_NET) += Space.o loopback.o obj-$(CONFIG_NET_SB1000) += sb1000.o -obj-$(CONFIG_SLIP) += slip.o -obj-$(CONFIG_SLHC) += slhc.o obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/ @@ -48,6 +46,8 @@ obj-$(CONFIG_PPP_SYNC_TTY) += ppp/ obj-$(CONFIG_PPPOE) += ppp/ obj-$(CONFIG_PPPOL2TP) += ppp/ obj-$(CONFIG_PPTP) += ppp/ +onj-$(CONFIG_SLIP) += slip/ +obj-$(CONFIG_SLHC) += slip/ obj-$(CONFIG_TR) += tokenring/ obj-$(CONFIG_WAN) += wan/ obj-$(CONFIG_ARCNET) += arcnet/ |