summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-08-22 19:43:53 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-08-22 19:43:53 +0000
commit8c98ba00748ab50df318a4cdff64ad31d7c7a43e (patch)
tree462dcbd5745cd8a3e12c787758df4bc75774ee51
parentb1b6b493bc38539f1a15e60980af8334cd4163d9 (diff)
Port kmod-tun to the new module layout
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4633 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/modules-2.6.mk4
-rw-r--r--package/kernel/modules.mk8
-rw-r--r--target/linux/Config.in7
3 files changed, 8 insertions, 11 deletions
diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk
index 70a1fcc23..08ac4da81 100644
--- a/include/modules-2.6.mk
+++ b/include/modules-2.6.mk
@@ -23,10 +23,6 @@ $(eval $(call KMOD_template,SCHED,sched,\
$(MODULES_DIR)/kernel/net/sched/*.ko \
,CONFIG_NET_SCHED))
-$(eval $(call KMOD_template,TUN,tun,\
- $(MODULES_DIR)/kernel/drivers/net/tun.ko \
-,CONFIG_TUN,,20,tun))
-
# Block devices
$(eval $(call KMOD_template,LOOP,loop,\
diff --git a/package/kernel/modules.mk b/package/kernel/modules.mk
index c24de60d0..947562052 100644
--- a/package/kernel/modules.mk
+++ b/package/kernel/modules.mk
@@ -297,6 +297,14 @@ FILES=$(MODULES_DIR)/kernel/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX)
endef
$(eval $(call KernelPackage,gre))
+define KernelPackage/tun
+TITLE:=Universal TUN/TAP driver
+DESCRIPTION:=Kernel support for the TUN/TAP tunneling device
+KCONFIG:=$(CONFIG_TUN)
+FILES:=$(MODULES_DIR)/kernel/drivers/net/tun.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,tun))
+
define KernelPackage/ppp
TITLE:=PPP modules
DESCRIPTION:=Kernel modules for PPP support
diff --git a/target/linux/Config.in b/target/linux/Config.in
index f9c72c01a..9b505df13 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -16,13 +16,6 @@ config PACKAGE_KMOD_ATM
help
ATM support
-config PACKAGE_KMOD_GRE
- prompt "kmod-gre.......................... GRE tunneling driver"
- tristate
- default m
- help
- Kernel support for GRE tunnels
-
config PACKAGE_KMOD_IPIP
prompt "kmod-ipip......................... IP in IP encapsulation support"
tristate