[magicbox] update to 2.6.26

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12066 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 25 insertions, 48 deletions

diff --git a/target/linux/magicbox/patches/001-magicbox_support.patch b/target/linux/magicbox/patches/001-magicbox_support.patch
index 5d8c3448bc..fe1221392f 100644
--- a/target/linux/magicbox/patches/001-magicbox_support.patch
+++ b/target/linux/magicbox/patches/001-magicbox_support.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.24.7/arch/ppc/platforms/4xx/Kconfig
-===================================================================
---- 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
+--- a/arch/ppc/platforms/4xx/Kconfig
++++ b/arch/ppc/platforms/4xx/Kconfig
+@@ -53,6 +53,12 @@
  	help
  	  This option enables support for the IBM PPC405GP evaluation board.
  
@@ -15,7 +13,7 @@ Index: linux-2.6.24.7/arch/ppc/platforms/4xx/Kconfig
  config XILINX_ML300
  	bool "Xilinx-ML300"
  	select XILINX_VIRTEX_II_PRO
-@@ -184,7 +190,7 @@ config BOOKE
+@@ -184,7 +190,7 @@
  
  config IBM_OCP
  	bool
@@ -24,7 +22,7 @@ Index: linux-2.6.24.7/arch/ppc/platforms/4xx/Kconfig
  	default y
  
  config IBM_EMAC4
-@@ -194,7 +200,7 @@ config IBM_EMAC4
+@@ -194,7 +200,7 @@
  
  config BIOS_FIXUP
  	bool
@@ -33,7 +31,7 @@ Index: linux-2.6.24.7/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 @@ config 403GCX
+@@ -205,7 +211,7 @@
  
  config 405EP
  	bool
@@ -42,11 +40,9 @@ Index: linux-2.6.24.7/arch/ppc/platforms/4xx/Kconfig
  	default y
  
  config 405GP
-Index: linux-2.6.24.7/arch/ppc/platforms/4xx/Makefile
-===================================================================
---- 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
+--- a/arch/ppc/platforms/4xx/Makefile
++++ b/arch/ppc/platforms/4xx/Makefile
+@@ -14,6 +14,7 @@
  obj-$(CONFIG_SYCAMORE)		+= sycamore.o
  obj-$(CONFIG_TAISHAN)		+= taishan.o
  obj-$(CONFIG_WALNUT)		+= walnut.o
@@ -54,10 +50,8 @@ Index: linux-2.6.24.7/arch/ppc/platforms/4xx/Makefile
  obj-$(CONFIG_XILINX_ML300)	+= xilinx_ml300.o
  obj-$(CONFIG_XILINX_ML403)	+= xilinx_ml403.o
  
-Index: linux-2.6.24.7/include/asm-ppc/ibm4xx.h
-===================================================================
---- linux-2.6.24.7.orig/include/asm-ppc/ibm4xx.h
-+++ linux-2.6.24.7/include/asm-ppc/ibm4xx.h
+--- a/include/asm-ppc/ibm4xx.h
++++ b/include/asm-ppc/ibm4xx.h
 @@ -19,6 +19,10 @@
  
  #ifdef CONFIG_40x
diff --git a/target/linux/magicbox/patches/100-cf_slot.patch b/target/linux/magicbox/patches/100-cf_slot.patch
index ca7ca4e621..e15d522df8 100644
--- a/target/linux/magicbox/patches/100-cf_slot.patch
+++ b/target/linux/magicbox/patches/100-cf_slot.patch
@@ -1,30 +1,18 @@
-Index: linux-2.6.24.7/drivers/ide/ide.c
-===================================================================
---- linux-2.6.24.7.orig/drivers/ide/ide.c
-+++ linux-2.6.24.7/drivers/ide/ide.c
-@@ -1563,6 +1563,7 @@ done:
- extern void __init pnpide_init(void);
- extern void __exit pnpide_exit(void);
- extern void __init h8300_ide_init(void);
-+extern void __init ide_magicbox_init(void);
+--- a/drivers/ide/ide.c
++++ b/drivers/ide/ide.c
+@@ -494,6 +494,9 @@
  
- /*
-  * probe_for_hwifs() finds/initializes "known" IDE interfaces
-@@ -1627,6 +1628,9 @@ static void __init probe_for_hwifs (void
- #ifdef CONFIG_H8300
- 	h8300_ide_init();
+ 	return -EPERM;
  #endif
 +#ifdef CONFIG_BLK_DEV_MAGICBOX_IDE
 +	ide_magicbox_init();
 +#endif
  }
  
- /*
-Index: linux-2.6.24.7/drivers/ide/Kconfig
-===================================================================
---- linux-2.6.24.7.orig/drivers/ide/Kconfig
-+++ linux-2.6.24.7/drivers/ide/Kconfig
-@@ -1018,6 +1018,14 @@ config BLK_DEV_MPC8xx_IDE
+ int set_pio_mode(ide_drive_t *drive, int arg)
+--- a/drivers/ide/Kconfig
++++ b/drivers/ide/Kconfig
+@@ -928,6 +928,14 @@
  
  	  If unsure, say N.
  
@@ -39,15 +27,10 @@ Index: linux-2.6.24.7/drivers/ide/Kconfig
  choice
  	prompt "Type of MPC8xx IDE interface"
  	depends on BLK_DEV_MPC8xx_IDE
-Index: linux-2.6.24.7/drivers/ide/Makefile
-===================================================================
---- linux-2.6.24.7.orig/drivers/ide/Makefile
-+++ linux-2.6.24.7/drivers/ide/Makefile
-@@ -37,6 +37,7 @@ ide-core-$(CONFIG_BLK_DEV_Q40IDE)	+= leg
- # built-in only drivers from ppc/
- ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE)	+= ppc/mpc8xx.o
- ide-core-$(CONFIG_BLK_DEV_IDE_PMAC)	+= ppc/pmac.o
-+ide-core-$(CONFIG_BLK_DEV_MAGICBOX_IDE)	+= ppc/magicbox_ide.o
+--- a/drivers/ide/ppc/Makefile
++++ b/drivers/ide/ppc/Makefile
+@@ -1,3 +1,4 @@
  
- # built-in only drivers from h8300/
- ide-core-$(CONFIG_IDE_H8300)		+= h8300/ide-h8300.o
+ obj-$(CONFIG_BLK_DEV_IDE_PMAC)		+= pmac.o
+ obj-$(CONFIG_BLK_DEV_MPC8xx_IDE)	+= mpc8xx.o
++obj-$(CONFIG_BLK_DEV_MAGICBOX_IDE)	+= magicbox_ide.o