path: root/net/Makefile
diff options
authorJames Chapman <>2010-04-02 06:18:28 +0000
committerDavid S. Miller <>2010-04-03 14:56:01 -0700
commit21b4aaa14329db793832e865f15000c5c0192ac3 (patch)
tree0cafa9589701dec0c39da0fbef5d7c7df0c987dc /net/Makefile
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 <> Reviewed-by: Randy Dunlap <> Signed-off-by: David S. Miller <>
Diffstat (limited to 'net/Makefile')
1 files changed, 1 insertions, 0 deletions
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/
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/