Import 2.2.15

diff --git a/Makefile b/Makefile
index 99d7e8e4ed65aaa306ec6185cb4872d7ba1a54d7..50edce1a481e14f8409c7f20eab50e40d95f2f6f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 2
 SUBLEVEL = 15
-EXTRAVERSION = pre20
+EXTRAVERSION = 
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
 

diff --git a/init/main.c b/init/main.c
index 5e584a7f16b483dff7f18ae525145ca89bbeb6ec..67a3bfdd40d94adab6827cc4ca910bb79aeef22b 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -156,9 +156,6 @@ extern void ctc_setup(char *str, int *ints);
 #ifdef CONFIG_IUCV
 extern void iucv_setup(char *str, int *ints);
 #endif
-#ifdef CONFIG_IUCV
-extern void iucv_setup(char *str, int *ints);
-#endif
 #ifdef CONFIG_ARCNET_COM90xxIO
 extern void com90io_setup(char *str, int *ints);
 #endif
@@ -656,10 +653,6 @@ static struct kernel_param cooked_params[] __initdata = {
        { "noapic", ioapic_setup },
        { "pirq=", ioapic_pirq_setup },
 #endif
-#ifdef CONFIG_IUCV
-        { "iucv=", iucv_setup } ,
-#endif
-
 #endif
 #ifdef CONFIG_BLK_DEV_RAM
        { "ramdisk_start=", ramdisk_start_setup },

diff --git a/net/ipv4/Config.in b/net/ipv4/Config.in
index eb4fd90084ec08154369465dcf913374e52cf897..8982bc1e971a792a9bd9e50b7b50939d698f9507 100644 (file)
--- a/net/ipv4/Config.in
+++ b/net/ipv4/Config.in
@@ -41,7 +41,6 @@ if [ "$CONFIG_IP_FIREWALL" = "y" ]; then
     bool 'IP: masquerading' CONFIG_IP_MASQUERADE
     if [ "$CONFIG_IP_MASQUERADE" != "n" ]; then
       comment 'Protocol-specific masquerading support will be built as modules.'
-      bool 'IP: UDP masquerading loose checking' CONFIG_IP_MASQUERADE_UDP_LOOSE
       bool 'IP: ICMP masquerading' CONFIG_IP_MASQUERADE_ICMP
       comment 'Protocol-specific masquerading support will be built as modules.'
       if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then