From eab390f2dced6fb3d922cb53531cee5bd0a03fd3 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 16 Jun 2004 19:51:09 +0000
Subject: enable NETFILTER, FILTER, IPIP and IPGRE in 2.4.18-pxa

BKrev: 40d0a4ad94tU-_-WqS9RKGCOqCaGpg
---
 .../defconfig-boxer                                         | 13 +++++++------
 .../defconfig-corgi                                         | 13 +++++++------
 .../defconfig-husky                                         | 13 +++++++------
 .../defconfig-poodle                                        | 13 +++++++------
 .../defconfig-shepherd                                      | 13 +++++++------
 5 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-boxer b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-boxer
index ba451e754f..672747be4f 100644
--- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-boxer
+++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-boxer
@@ -184,8 +184,8 @@ CONFIG_BATT=y
 CONFIG_ARM_THUMB=y
 CONFIG_ARM_FCSE=y
 # CONFIG_DISCONTIGMEM is not set
-CONFIG_PREEMPT=y
-CONFIG_LOCK_BREAK=y
+# CONFIG_PREEMPT is not set
+# CONFIG_LOCK_BREAK is not set
 
 #
 # General setup
@@ -370,15 +370,16 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_NETLINK_DEV=y
-# CONFIG_NETFILTER is not set
-# CONFIG_FILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_FILTER=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
 # CONFIG_ARPD is not set
 # CONFIG_INET_ECN is not set
 # CONFIG_SYN_COOKIES is not set
diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi
index bf24bad458..d271eccdde 100644
--- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi
+++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi
@@ -184,8 +184,8 @@ CONFIG_XSCALE_CACHE_ERRATA=y
 CONFIG_ARM_THUMB=y
 # CONFIG_ARM_FCSE is not set
 # CONFIG_DISCONTIGMEM is not set
-CONFIG_PREEMPT=y
-CONFIG_LOCK_BREAK=y
+# CONFIG_PREEMPT is not set
+# CONFIG_LOCK_BREAK is not set
 
 #
 # General setup
@@ -370,15 +370,16 @@ CONFIG_BLK_DEV_INITRD=y
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_NETLINK_DEV=y
-# CONFIG_NETFILTER is not set
-# CONFIG_FILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_FILTER=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
 # CONFIG_ARPD is not set
 # CONFIG_INET_ECN is not set
 # CONFIG_SYN_COOKIES is not set
diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky
index c2f002a7cd..4c01a5ad7b 100644
--- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky
+++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky
@@ -172,8 +172,8 @@ CONFIG_BATT=y
 CONFIG_ARM_THUMB=y
 CONFIG_ARM_FCSE=y
 # CONFIG_DISCONTIGMEM is not set
-CONFIG_PREEMPT=y
-CONFIG_LOCK_BREAK=y
+# CONFIG_PREEMPT is not set
+# CONFIG_LOCK_BREAK is not set
 
 #
 # General setup
@@ -346,15 +346,16 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_NETLINK_DEV=y
-# CONFIG_NETFILTER is not set
-# CONFIG_FILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_FILTER=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
 # CONFIG_ARPD is not set
 # CONFIG_INET_ECN is not set
 # CONFIG_SYN_COOKIES is not set
diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle
index 22621e9073..b49b75cce8 100644
--- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle
+++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle
@@ -184,8 +184,8 @@ CONFIG_XSCALE_CACHE_ERRATA=y
 CONFIG_ARM_THUMB=y
 CONFIG_ARM_FCSE=y
 # CONFIG_DISCONTIGMEM is not set
-CONFIG_PREEMPT=y
-CONFIG_LOCK_BREAK=y
+# CONFIG_PREEMPT is not set
+# CONFIG_LOCK_BREAK is not set
 
 #
 # General setup
@@ -370,15 +370,16 @@ CONFIG_BLK_DEV_INITRD=y
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_NETLINK_DEV=y
-# CONFIG_NETFILTER is not set
-# CONFIG_FILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_FILTER=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
 # CONFIG_ARPD is not set
 # CONFIG_INET_ECN is not set
 # CONFIG_SYN_COOKIES is not set
diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd
index 3c9fc712c4..6725797ee0 100644
--- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd
+++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd
@@ -184,8 +184,8 @@ CONFIG_BATT=y
 CONFIG_ARM_THUMB=y
 CONFIG_ARM_FCSE=y
 # CONFIG_DISCONTIGMEM is not set
-CONFIG_PREEMPT=y
-CONFIG_LOCK_BREAK=y
+# CONFIG_PREEMPT is not set
+# CONFIG_LOCK_BREAK is not set
 
 #
 # General setup
@@ -370,15 +370,16 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_NETLINK_DEV=y
-# CONFIG_NETFILTER is not set
-# CONFIG_FILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_FILTER=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
 # CONFIG_ARPD is not set
 # CONFIG_INET_ECN is not set
 # CONFIG_SYN_COOKIES is not set
-- 
cgit v1.2.3