mac80211: always store broadcom firmware in b43 and b43legacy dir

[openwrt.git] / target / linux / lantiq / patches-2.6.39 / 0006-MIPS-Lantiq-Add-mips_machine-support.patch

diff --git a/target/linux/lantiq/patches-2.6.39/0006-MIPS-Lantiq-Add-mips_machine-support.patch b/target/linux/lantiq/patches-2.6.39/0006-MIPS-Lantiq-Add-mips_machine-support.patch
index 9e02b6a..0c1c0e7 100644 (file)
--- a/target/linux/lantiq/patches-2.6.39/0006-MIPS-Lantiq-Add-mips_machine-support.patch
+++ b/target/linux/lantiq/patches-2.6.39/0006-MIPS-Lantiq-Add-mips_machine-support.patch
@@ -27,7 +27,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig

-@@ -190,6 +190,7 @@
+@@ -228,6 +228,7 @@ config LANTIQ

        select SWAP_IO_SPACE
        select BOOT_RAW
        select HAVE_CLK
        select SWAP_IO_SPACE
        select BOOT_RAW
        select HAVE_CLK


@@ -58,7 +58,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
 +#endif
 --- a/arch/mips/lantiq/prom.h
 +++ b/arch/mips/lantiq/prom.h
 +#endif
 --- a/arch/mips/lantiq/prom.h
 +++ b/arch/mips/lantiq/prom.h

-@@ -20,5 +20,6 @@
+@@ -20,5 +20,6 @@ struct ltq_soc_info {

  };
  
  extern void ltq_soc_detect(struct ltq_soc_info *i);
  };
  
  extern void ltq_soc_detect(struct ltq_soc_info *i);


@@ -80,7 +80,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  void __init plat_mem_setup(void)
  {
        /* assume 16M as default incase uboot fails to pass proper ramsize */
  void __init plat_mem_setup(void)
  {
        /* assume 16M as default incase uboot fails to pass proper ramsize */

-@@ -32,10 +38,32 @@
+@@ -32,10 +38,32 @@ void __init plat_mem_setup(void)

                if (!strncmp(e, "memsize=", 8)) {
                        e += 8;
                        if (strict_strtoul(e, 0, &memsize))
                if (!strncmp(e, "memsize=", 8)) {
                        e += 8;
                        if (strict_strtoul(e, 0, &memsize))