refresh kernel patches

[openwrt/staging/florian.git] / target / linux / magicbox / patches / 001-magicbox_support.patch

diff --git a/target/linux/magicbox/patches/001-magicbox_support.patch b/target/linux/magicbox/patches/001-magicbox_support.patch
index de7e86be80389ef21ecca41a4e54bcfa8b7e3f2a..5d8c3448bcff7e9af96dd164943e8057e573a82d 100644 (file)
--- a/target/linux/magicbox/patches/001-magicbox_support.patch
+++ b/target/linux/magicbox/patches/001-magicbox_support.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.22-rc6/arch/ppc/platforms/4xx/Kconfig
+Index: linux-2.6.24.7/arch/ppc/platforms/4xx/Kconfig
 ===================================================================
---- linux-2.6.22-rc6.orig/arch/ppc/platforms/4xx/Kconfig       2007-06-28 08:23:13.508980416 +0200
-+++ linux-2.6.22-rc6/arch/ppc/platforms/4xx/Kconfig    2007-06-28 08:23:15.637656808 +0200
-@@ -53,6 +53,12 @@
+--- linux-2.6.24.7.orig/arch/ppc/platforms/4xx/Kconfig
++++ linux-2.6.24.7/arch/ppc/platforms/4xx/Kconfig
+@@ -53,6 +53,12 @@ config WALNUT
        help
          This option enables support for the IBM PPC405GP evaluation board.
  
@@ -15,7 +15,7 @@ Index: linux-2.6.22-rc6/arch/ppc/platforms/4xx/Kconfig
  config XILINX_ML300
        bool "Xilinx-ML300"
        select XILINX_VIRTEX_II_PRO
-@@ -184,7 +190,7 @@
+@@ -184,7 +190,7 @@ config BOOKE
  
  config IBM_OCP
        bool
@@ -24,7 +24,7 @@ Index: linux-2.6.22-rc6/arch/ppc/platforms/4xx/Kconfig
        default y
  
  config IBM_EMAC4
-@@ -194,7 +200,7 @@
+@@ -194,7 +200,7 @@ config IBM_EMAC4
  
  config BIOS_FIXUP
        bool
@@ -33,7 +33,7 @@ Index: linux-2.6.22-rc6/arch/ppc/platforms/4xx/Kconfig
        default y
  
  # OAK doesn't exist but wanted to keep this around for any future 403GCX boards
-@@ -205,7 +211,7 @@
+@@ -205,7 +211,7 @@ config 403GCX
  
  config 405EP
        bool
@@ -42,11 +42,11 @@ Index: linux-2.6.22-rc6/arch/ppc/platforms/4xx/Kconfig
        default y
  
  config 405GP
-Index: linux-2.6.22-rc6/arch/ppc/platforms/4xx/Makefile
+Index: linux-2.6.24.7/arch/ppc/platforms/4xx/Makefile
 ===================================================================
---- linux-2.6.22-rc6.orig/arch/ppc/platforms/4xx/Makefile      2007-06-28 08:23:13.516979200 +0200
-+++ linux-2.6.22-rc6/arch/ppc/platforms/4xx/Makefile   2007-06-28 08:23:15.637656808 +0200
-@@ -14,6 +14,7 @@
+--- linux-2.6.24.7.orig/arch/ppc/platforms/4xx/Makefile
++++ linux-2.6.24.7/arch/ppc/platforms/4xx/Makefile
+@@ -14,6 +14,7 @@ obj-$(CONFIG_REDWOOD_6)              += redwood6.o
  obj-$(CONFIG_SYCAMORE)                += sycamore.o
  obj-$(CONFIG_TAISHAN)         += taishan.o
  obj-$(CONFIG_WALNUT)          += walnut.o
@@ -54,10 +54,10 @@ Index: linux-2.6.22-rc6/arch/ppc/platforms/4xx/Makefile
  obj-$(CONFIG_XILINX_ML300)    += xilinx_ml300.o
  obj-$(CONFIG_XILINX_ML403)    += xilinx_ml403.o
  
-Index: linux-2.6.22-rc6/include/asm-ppc/ibm4xx.h
+Index: linux-2.6.24.7/include/asm-ppc/ibm4xx.h
 ===================================================================
---- linux-2.6.22-rc6.orig/include/asm-ppc/ibm4xx.h     2007-06-28 08:23:13.526977680 +0200
-+++ linux-2.6.22-rc6/include/asm-ppc/ibm4xx.h  2007-06-28 08:23:15.637656808 +0200
+--- linux-2.6.24.7.orig/include/asm-ppc/ibm4xx.h
++++ linux-2.6.24.7/include/asm-ppc/ibm4xx.h
 @@ -19,6 +19,10 @@
  
  #ifdef CONFIG_40x