---

yaml --- r: 193936 b: refs/heads/master c: 21b4aaa h: refs/heads/master v: v3
git-mirror · Apr 3, 2010 · 197ce37 · 197ce37
1 parent f5b23ca
commit 197ce37
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22bedad3ce112d5ca1eaf043d4990fa2ed698c87
+refs/heads/master: 21b4aaa14329db793832e865f15000c5c0192ac3
diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -160,7 +160,7 @@ obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
 obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o
 obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o
 obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
-obj-$(CONFIG_PPPOL2TP) += pppox.o pppol2tp.o
+obj-$(CONFIG_PPPOL2TP) += pppox.o
 
 obj-$(CONFIG_SLIP) += slip.o
 obj-$(CONFIG_SLHC) += slhc.o

diff --git a/trunk/net/Makefile b/trunk/net/Makefile
@@ -40,6 +40,7 @@ obj-$(CONFIG_BT)		+= bluetooth/
 obj-$(CONFIG_SUNRPC)		+= sunrpc/
 obj-$(CONFIG_AF_RXRPC)		+= rxrpc/
 obj-$(CONFIG_ATM)		+= atm/
+obj-$(CONFIG_PPPOL2TP)		+= l2tp/
 obj-$(CONFIG_DECNET)		+= decnet/
 obj-$(CONFIG_ECONET)		+= econet/
 obj-$(CONFIG_PHONET)		+= phonet/

diff --git a/trunk/net/l2tp/Makefile b/trunk/net/l2tp/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the L2TP.
+#
+
+obj-$(CONFIG_PPPOL2TP) += pppol2tp.o
diff --git a/trunk/drivers/net/pppol2tp.c → trunk/net/l2tp/pppol2tp.c b/trunk/drivers/net/pppol2tp.c → trunk/net/l2tp/pppol2tp.c