diff --git a/[refs] b/[refs]
index f6775b03cd52..a53e23c2537a 100644
--- 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
index ba06c1c0db8b..f8444f439a65 100644
--- 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
index a5eae27aa42d..13ca77e0eb08 100644
--- 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
new file mode 100644
index 000000000000..9af41e898a04
--- /dev/null
+++ 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 b/trunk/net/l2tp/pppol2tp.c
similarity index 100%
rename from trunk/drivers/net/pppol2tp.c
rename to trunk/net/l2tp/pppol2tp.c