[rdc] refresh 2.6.30 kernel patches

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

diff --git a/target/linux/rdc/patches-2.6.30/001-rdc3210_flash_map.patch b/target/linux/rdc/patches-2.6.30/001-rdc3210_flash_map.patch
index 2c35b84..d1ac2e7 100644 (file)
--- a/target/linux/rdc/patches-2.6.30/001-rdc3210_flash_map.patch
+++ b/target/linux/rdc/patches-2.6.30/001-rdc3210_flash_map.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/maps/Kconfig
 +++ b/drivers/mtd/maps/Kconfig
 --- a/drivers/mtd/maps/Kconfig
 +++ b/drivers/mtd/maps/Kconfig

-@@ -112,6 +112,50 @@ config MTD_SUN_UFLASH
+@@ -123,6 +123,50 @@ config MTD_SUN_UFLASH

          Sun Microsystems boardsets.  This driver will require CFI support
          in the kernel, so if you did not enable CFI previously, do that now.
  
          Sun Microsystems boardsets.  This driver will require CFI support
          in the kernel, so if you did not enable CFI previously, do that now.
  

diff --git a/target/linux/rdc/patches-2.6.30/003-rootfstype.patch b/target/linux/rdc/patches-2.6.30/003-rootfstype.patch
index 386e638..e7ed527 100644 (file)
--- a/target/linux/rdc/patches-2.6.30/003-rootfstype.patch
+++ b/target/linux/rdc/patches-2.6.30/003-rootfstype.patch
@@ -1,6 +1,6 @@
 --- a/init/do_mounts.c
 +++ b/init/do_mounts.c
 --- a/init/do_mounts.c
 +++ b/init/do_mounts.c

-@@ -189,6 +189,8 @@ static void __init get_fs_names(char *pa
+@@ -191,6 +191,8 @@ static void __init get_fs_names(char *pa

  {
        char *s = page;
  
  {
        char *s = page;
  

diff --git a/target/linux/rdc/patches-2.6.30/005-fix_amit_breakage.patch b/target/linux/rdc/patches-2.6.30/005-fix_amit_breakage.patch
index 8103e84..92bce80 100644 (file)
--- a/target/linux/rdc/patches-2.6.30/005-fix_amit_breakage.patch
+++ b/target/linux/rdc/patches-2.6.30/005-fix_amit_breakage.patch
@@ -21,7 +21,7 @@
  
  /*
   * Invoke the realmode switch hook if present; otherwise
  
  /*
   * Invoke the realmode switch hook if present; otherwise

-@@ -156,6 +159,16 @@ void go_to_protected_mode(void)
+@@ -112,6 +115,16 @@ void go_to_protected_mode(void)

                die();
        }
  
                die();
        }
  

diff --git a/target/linux/rdc/patches-2.6.30/008-r8610_flash_map.patch b/target/linux/rdc/patches-2.6.30/008-r8610_flash_map.patch
index e0ccb83..b374c06 100644 (file)
--- a/target/linux/rdc/patches-2.6.30/008-r8610_flash_map.patch
+++ b/target/linux/rdc/patches-2.6.30/008-r8610_flash_map.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.29.5/drivers/mtd/maps/Kconfig
-===================================================================
---- linux-2.6.29.5.orig/drivers/mtd/maps/Kconfig       2009-06-19 11:26:44.000000000 +0200
-+++ linux-2.6.29.5/drivers/mtd/maps/Kconfig    2009-06-19 11:26:45.000000000 +0200
-@@ -167,6 +167,12 @@
+--- a/drivers/mtd/maps/Kconfig
++++ b/drivers/mtd/maps/Kconfig
+@@ -167,6 +167,12 @@ config MTD_RDC3210_BUSWIDTH

          Number of bytes addressed on the RDC-3210 flash device before
          addressing the same chip again
  
          Number of bytes addressed on the RDC-3210 flash device before
          addressing the same chip again
  


@@ -15,11 +13,9 @@ Index: linux-2.6.29.5/drivers/mtd/maps/Kconfig
  config MTD_SC520CDP
        tristate "CFI Flash device mapped on AMD SC520 CDP"
        depends on X86 && MTD_CFI && MTD_CONCAT
  config MTD_SC520CDP
        tristate "CFI Flash device mapped on AMD SC520 CDP"
        depends on X86 && MTD_CFI && MTD_CONCAT

-Index: linux-2.6.29.5/drivers/mtd/maps/Makefile
-===================================================================
---- linux-2.6.29.5.orig/drivers/mtd/maps/Makefile      2009-06-19 11:26:44.000000000 +0200
-+++ linux-2.6.29.5/drivers/mtd/maps/Makefile   2009-06-19 11:26:45.000000000 +0200
-@@ -28,6 +28,7 @@
+--- a/drivers/mtd/maps/Makefile
++++ b/drivers/mtd/maps/Makefile
+@@ -28,6 +28,7 @@ obj-$(CONFIG_MTD_PMC_MSP_EVM)   += pmcms

  obj-$(CONFIG_MTD_PMC_MSP_RAMROOT)+= pmcmsp-ramroot.o
  obj-$(CONFIG_MTD_PCMCIA)      += pcmciamtd.o
  obj-$(CONFIG_MTD_RDC3210)     += rdc3210.o
  obj-$(CONFIG_MTD_PMC_MSP_RAMROOT)+= pmcmsp-ramroot.o
  obj-$(CONFIG_MTD_PCMCIA)      += pcmciamtd.o
  obj-$(CONFIG_MTD_RDC3210)     += rdc3210.o

diff --git a/target/linux/rdc/patches-2.6.30/009-rdc321x_select_embedded.patch b/target/linux/rdc/patches-2.6.30/009-rdc321x_select_embedded.patch
index 84ab6c5..0e0e119 100644 (file)
--- a/target/linux/rdc/patches-2.6.30/009-rdc321x_select_embedded.patch
+++ b/target/linux/rdc/patches-2.6.30/009-rdc321x_select_embedded.patch
@@ -1,6 +1,6 @@
---- a/arch/x86/Kconfig 2009-06-19 15:06:16.000000000 +0200
-+++ b/arch/x86/Kconfig 2009-06-19 15:06:01.000000000 +0200
-@@ -380,6 +380,7 @@
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -380,6 +380,7 @@ config X86_RDC321X

        depends on X86_EXTENDED_PLATFORM
        select M486
        select X86_REBOOTFIXUPS
        depends on X86_EXTENDED_PLATFORM
        select M486
        select X86_REBOOTFIXUPS