From 5e7c9908cc43229ef3638da6f4b7ecd79838d9f8 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 22 Aug 2006 12:40:33 +0000
Subject: [PATCH] Port kmod-gre to the new module layout

SVN-Revision: 4630
---
 openwrt/include/modules-2.6.mk    | 4 ----
 openwrt/package/kernel/modules.mk | 8 ++++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/openwrt/include/modules-2.6.mk b/openwrt/include/modules-2.6.mk
index 4ea28fb1679..70a1fcc23c3 100644
--- a/openwrt/include/modules-2.6.mk
+++ b/openwrt/include/modules-2.6.mk
@@ -15,10 +15,6 @@ $(eval $(call KMOD_template,ATM,atm,\
 	$(MODULES_DIR)/kernel/drivers/atm/atmtcp.ko \
 ,CONFIG_ATM,,50,atm))
 
-$(eval $(call KMOD_template,GRE,gre,\
-	$(MODULES_DIR)/kernel/net/ipv4/ip_gre.ko \
-,CONFIG_NET_IPGRE))
-
 $(eval $(call KMOD_template,IPIP,ipip,\
 	$(MODULES_DIR)/kernel/net/ipv4/ipip.ko \
 ,CONFIG_NET_IPIP,,60,ipip))
diff --git a/openwrt/package/kernel/modules.mk b/openwrt/package/kernel/modules.mk
index 090945c3e06..c24de60d0de 100644
--- a/openwrt/package/kernel/modules.mk
+++ b/openwrt/package/kernel/modules.mk
@@ -289,6 +289,14 @@ FILES:=$(MODULES_DIR)/kernel/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
 endef
 $(eval $(call KernelPackage,ipv6))
 
+define KernelPackage/gre
+TITLE:=GRE support
+DESCRIPTION:=Generic Routing Encapsulation support
+KCONFIG=$(CONFIG_NET_IPGRE)
+FILES=$(MODULES_DIR)/kernel/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,gre))
+
 define KernelPackage/ppp
 TITLE:=PPP modules
 DESCRIPTION:=Kernel modules for PPP support