bcm47xx compile fix for .21, thanks to noz

[openwrt/staging/mkresin.git] / target / linux / brcm47xx-2.6 / patches / 100-board_support.patch

diff --git a/target/linux/brcm47xx-2.6/patches/100-board_support.patch b/target/linux/brcm47xx-2.6/patches/100-board_support.patch
index 4d06dcdafefeed2c240d1d4bd67eefc77b9830e1..d80a4fbc8b040976e039a4c1b6508c37859dcc5a 100644 (file)
--- a/target/linux/brcm47xx-2.6/patches/100-board_support.patch
+++ b/target/linux/brcm47xx-2.6/patches/100-board_support.patch
@@ -12,7 +12,7 @@ diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
  mainmenu "Linux/MIPS Kernel Configuration"
  
  menu "Machine selection"
-@@ -222,6 +226,23 @@
+@@ -240,6 +240,23 @@
         Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
         Olivetti M700-10 workstations.
  
@@ -39,7 +39,7 @@ diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
 diff -urN linux.old/arch/mips/kernel/cpu-probe.c linux.dev/arch/mips/kernel/cpu-probe.c
 --- linux.old/arch/mips/kernel/cpu-probe.c     2007-01-26 00:51:33.000000000 +0100
 +++ linux.dev/arch/mips/kernel/cpu-probe.c     2007-01-25 23:34:01.000000000 +0100
-@@ -723,6 +723,28 @@
+@@ -711,6 +711,28 @@
  }
  
  
@@ -68,7 +68,7 @@ diff -urN linux.old/arch/mips/kernel/cpu-probe.c linux.dev/arch/mips/kernel/cpu-
  __init void cpu_probe(void)
  {
        struct cpuinfo_mips *c = &current_cpu_data;
-@@ -745,6 +767,9 @@
+@@ -733,6 +755,9 @@
        case PRID_COMP_SIBYTE:
                cpu_probe_sibyte(c);
                break;
@@ -93,7 +93,7 @@ diff -urN linux.old/arch/mips/kernel/proc.c linux.dev/arch/mips/kernel/proc.c
 diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
 --- linux.old/arch/mips/Makefile       2007-01-26 00:51:33.000000000 +0100
 +++ linux.dev/arch/mips/Makefile       2007-01-25 23:34:01.000000000 +0100
-@@ -571,6 +571,18 @@
+@@ -576,6 +576,18 @@
  load-$(CONFIG_SIBYTE_BIGSUR)  := 0xffffffff80100000
  
  #
@@ -109,13 +109,13 @@ diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
 +core-$(CONFIG_CFE)            += arch/mips/cfe/
 +
 +#
- # SNI RM200 PCI
+ # SNI RM
  #
- core-$(CONFIG_SNI_RM200_PCI)  += arch/mips/sni/
+ core-$(CONFIG_SNI_RM)         += arch/mips/sni/
 diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
 --- linux.old/arch/mips/mm/tlbex.c     2007-01-26 00:51:33.000000000 +0100
 +++ linux.dev/arch/mips/mm/tlbex.c     2007-01-25 23:34:01.000000000 +0100
-@@ -880,6 +880,8 @@
+@@ -892,6 +892,8 @@
        case CPU_4KSC:
        case CPU_20KC:
        case CPU_25KF:
@@ -139,15 +139,15 @@ diff -urN linux.old/drivers/Kconfig linux.dev/drivers/Kconfig
 diff -urN linux.old/drivers/Makefile linux.dev/drivers/Makefile
 --- linux.old/drivers/Makefile 2007-01-26 00:51:33.000000000 +0100
 +++ linux.dev/drivers/Makefile 2007-01-25 23:34:01.000000000 +0100
-@@ -77,3 +77,4 @@
- obj-$(CONFIG_SUPERH)          += sh/
- obj-$(CONFIG_GENERIC_TIME)    += clocksource/
+@@ -81,3 +81,4 @@
  obj-$(CONFIG_DMA_ENGINE)      += dma/
+ obj-$(CONFIG_HID)             += hid/
+ obj-$(CONFIG_PPC_PS3)         += ps3/
 +obj-$(CONFIG_SSB)             += ssb/
 diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/bootinfo.h
 --- linux.old/include/asm-mips/bootinfo.h      2007-01-26 00:51:33.000000000 +0100
 +++ linux.dev/include/asm-mips/bootinfo.h      2007-01-25 23:34:01.000000000 +0100
-@@ -212,6 +212,12 @@
+@@ -213,6 +213,12 @@
  #define MACH_GROUP_NEC_EMMA2RH 25     /* NEC EMMA2RH (was 23)         */
  #define  MACH_NEC_MARKEINS    0       /* NEC EMMA2RH Mark-eins        */
  
@@ -191,7 +191,7 @@ diff -urN linux.old/include/asm-mips/cpu.h linux.dev/include/asm-mips/cpu.h
 diff -urN linux.old/include/linux/pci_ids.h linux.dev/include/linux/pci_ids.h
 --- linux.old/include/linux/pci_ids.h  2007-01-26 00:51:33.000000000 +0100
 +++ linux.dev/include/linux/pci_ids.h  2007-01-25 23:34:01.000000000 +0100
-@@ -1950,6 +1950,7 @@
+@@ -1981,6 +1981,7 @@
  #define PCI_DEVICE_ID_TIGON3_5906M    0x1713
  #define PCI_DEVICE_ID_BCM4401         0x4401
  #define PCI_DEVICE_ID_BCM4401B0               0x4402