aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Chapman <jchapman@katalix.com>2010-04-02 02:18:28 -0400
committerDavid S. Miller <davem@davemloft.net>2010-04-03 17:56:01 -0400
commit21b4aaa14329db793832e865f15000c5c0192ac3 (patch)
tree0cafa9589701dec0c39da0fbef5d7c7df0c987dc
parent22bedad3ce112d5ca1eaf043d4990fa2ed698c87 (diff)
l2tp: Relocate pppol2tp driver to new net/l2tp directory
This patch moves the existing pppol2tp driver from drivers/net into a new net/l2tp directory, which is where the upcoming L2TPv3 code will live. The existing CONFIG_PPPOL2TP config option is left in its current place to avoid "make oldconfig" issues when an existing pppol2tp user takes this change. (This is the same approach used for the pppoatm driver, which moved to net/atm.) There are no code changes. The existing drivers/net/pppol2tp.c is simply moved to net/l2tp. Signed-off-by: James Chapman <jchapman@katalix.com> Reviewed-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/Makefile2
-rw-r--r--net/Makefile1
-rw-r--r--net/l2tp/Makefile5
-rw-r--r--net/l2tp/pppol2tp.c (renamed from drivers/net/pppol2tp.c)0
4 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index ba06c1c0db8b..f8444f439a65 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -160,7 +160,7 @@ obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
160obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o 160obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o
161obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o 161obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o
162obj-$(CONFIG_PPPOE) += pppox.o pppoe.o 162obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
163obj-$(CONFIG_PPPOL2TP) += pppox.o pppol2tp.o 163obj-$(CONFIG_PPPOL2TP) += pppox.o
164 164
165obj-$(CONFIG_SLIP) += slip.o 165obj-$(CONFIG_SLIP) += slip.o
166obj-$(CONFIG_SLHC) += slhc.o 166obj-$(CONFIG_SLHC) += slhc.o
diff --git a/net/Makefile b/net/Makefile
index a5eae27aa42d..13ca77e0eb08 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -40,6 +40,7 @@ obj-$(CONFIG_BT) += bluetooth/
40obj-$(CONFIG_SUNRPC) += sunrpc/ 40obj-$(CONFIG_SUNRPC) += sunrpc/
41obj-$(CONFIG_AF_RXRPC) += rxrpc/ 41obj-$(CONFIG_AF_RXRPC) += rxrpc/
42obj-$(CONFIG_ATM) += atm/ 42obj-$(CONFIG_ATM) += atm/
43obj-$(CONFIG_PPPOL2TP) += l2tp/
43obj-$(CONFIG_DECNET) += decnet/ 44obj-$(CONFIG_DECNET) += decnet/
44obj-$(CONFIG_ECONET) += econet/ 45obj-$(CONFIG_ECONET) += econet/
45obj-$(CONFIG_PHONET) += phonet/ 46obj-$(CONFIG_PHONET) += phonet/
diff --git a/net/l2tp/Makefile b/net/l2tp/Makefile
new file mode 100644
index 000000000000..9af41e898a04
--- /dev/null
+++ b/net/l2tp/Makefile
@@ -0,0 +1,5 @@
1#
2# Makefile for the L2TP.
3#
4
5obj-$(CONFIG_PPPOL2TP) += pppol2tp.o
diff --git a/drivers/net/pppol2tp.c b/net/l2tp/pppol2tp.c
index 449a9825200d..449a9825200d 100644
--- a/drivers/net/pppol2tp.c
+++ b/net/l2tp/pppol2tp.c