[brcm63xx] do not override cfg80211-related config symbols

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.31 / 028-module_exports.patch

diff --git a/target/linux/generic-2.6/patches-2.6.31/028-module_exports.patch b/target/linux/generic-2.6/patches-2.6.31/028-module_exports.patch
index 355139e..3d73a02 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.31/028-module_exports.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/028-module_exports.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.31.5/include/asm-generic/vmlinux.lds.h
-===================================================================
---- linux-2.6.31.5.orig/include/asm-generic/vmlinux.lds.h      2009-10-23 00:57:56.000000000 +0200
-+++ linux-2.6.31.5/include/asm-generic/vmlinux.lds.h   2009-10-23 12:43:50.000000000 +0200
+--- a/include/asm-generic/vmlinux.lds.h
++++ b/include/asm-generic/vmlinux.lds.h

 @@ -55,6 +55,27 @@
  #define LOAD_OFFSET 0
  #endif
 @@ -55,6 +55,27 @@
  #define LOAD_OFFSET 0
  #endif


@@ -86,11 +84,9 @@ Index: linux-2.6.31.5/include/asm-generic/vmlinux.lds.h
        }                                                               \
                                                                        \
        /* __*init sections */                                          \
        }                                                               \
                                                                        \
        /* __*init sections */                                          \

-Index: linux-2.6.31.5/include/linux/module.h
-===================================================================
---- linux-2.6.31.5.orig/include/linux/module.h 2009-10-23 00:57:56.000000000 +0200
-+++ linux-2.6.31.5/include/linux/module.h      2009-10-23 12:43:50.000000000 +0200
-@@ -188,16 +188,24 @@
+--- a/include/linux/module.h
++++ b/include/linux/module.h
+@@ -188,16 +188,24 @@ void *__symbol_get_gpl(const char *symbo

  #define __CRC_SYMBOL(sym, sec)
  #endif
  
  #define __CRC_SYMBOL(sym, sec)
  #endif
  


@@ -117,11 +113,9 @@ Index: linux-2.6.31.5/include/linux/module.h
        = { (unsigned long)&sym, __kstrtab_##sym }
  
  #define EXPORT_SYMBOL(sym)                                    \
        = { (unsigned long)&sym, __kstrtab_##sym }
  
  #define EXPORT_SYMBOL(sym)                                    \

-Index: linux-2.6.31.5/arch/arm/kernel/vmlinux.lds.S
-===================================================================
---- linux-2.6.31.5.orig/arch/arm/kernel/vmlinux.lds.S  2009-10-23 00:57:56.000000000 +0200
-+++ linux-2.6.31.5/arch/arm/kernel/vmlinux.lds.S       2009-10-23 12:43:50.000000000 +0200
-@@ -79,26 +79,6 @@
+--- a/arch/arm/kernel/vmlinux.lds.S
++++ b/arch/arm/kernel/vmlinux.lds.S
+@@ -79,26 +79,6 @@ SECTIONS

  #endif
        }
  
  #endif
        }
  


@@ -148,7 +142,7 @@ Index: linux-2.6.31.5/arch/arm/kernel/vmlinux.lds.S
        .text : {                       /* Real text segment            */
                _text = .;              /* Text and read-only data      */
                        __exception_text_start = .;
        .text : {                       /* Real text segment            */
                _text = .;              /* Text and read-only data      */
                        __exception_text_start = .;

-@@ -205,6 +185,28 @@
+@@ -205,6 +185,28 @@ SECTIONS

                __bss_stop = .;
                _end = .;
        }
                __bss_stop = .;
                _end = .;
        }


@@ -177,11 +171,9 @@ Index: linux-2.6.31.5/arch/arm/kernel/vmlinux.lds.S
                                        /* Stabs debugging sections.    */
        .stab 0 : { *(.stab) }
        .stabstr 0 : { *(.stabstr) }
                                        /* Stabs debugging sections.    */
        .stab 0 : { *(.stab) }
        .stabstr 0 : { *(.stabstr) }

-Index: linux-2.6.31.5/arch/powerpc/kernel/vmlinux.lds.S
-===================================================================
---- linux-2.6.31.5.orig/arch/powerpc/kernel/vmlinux.lds.S      2009-10-23 00:57:56.000000000 +0200
-+++ linux-2.6.31.5/arch/powerpc/kernel/vmlinux.lds.S   2009-10-23 12:43:50.000000000 +0200
-@@ -37,12 +37,6 @@
+--- a/arch/powerpc/kernel/vmlinux.lds.S
++++ b/arch/powerpc/kernel/vmlinux.lds.S
+@@ -37,12 +37,6 @@ jiffies = jiffies_64 + 4;

  #endif
  SECTIONS
  {
  #endif
  SECTIONS
  {


@@ -194,7 +186,7 @@ Index: linux-2.6.31.5/arch/powerpc/kernel/vmlinux.lds.S
        . = KERNELBASE;
  
  /*
        . = KERNELBASE;
  
  /*

-@@ -295,6 +289,12 @@
+@@ -295,6 +289,12 @@ SECTIONS

                __bss_stop = .;
        }
  
                __bss_stop = .;
        }