[kernel] refresh 2.6.35 patches

[openwrt.git] / target / linux / kirkwood / patches / 100-dockstar.patch

diff --git a/target/linux/kirkwood/patches/100-dockstar.patch b/target/linux/kirkwood/patches/100-dockstar.patch
index 921faaf..f6ac90b 100644 (file)
--- a/target/linux/kirkwood/patches/100-dockstar.patch
+++ b/target/linux/kirkwood/patches/100-dockstar.patch
@@ -11,13 +11,11 @@ Signed-off-by: Eric Cooper <ecc@xxxxxxx>
  4 files changed, 120 insertions(+), 0 deletions(-)
  create mode 100644 arch/arm/mach-kirkwood/dockstar-setup.c
 
  4 files changed, 120 insertions(+), 0 deletions(-)
  create mode 100644 arch/arm/mach-kirkwood/dockstar-setup.c
 

-diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
-index 29b2163..74d832f 100644

 --- a/arch/arm/mach-kirkwood/Kconfig
 +++ b/arch/arm/mach-kirkwood/Kconfig
 --- a/arch/arm/mach-kirkwood/Kconfig
 +++ b/arch/arm/mach-kirkwood/Kconfig

-@@ -32,6 +32,12 @@ config MACH_TS219
+@@ -99,6 +99,12 @@ config MACH_NET5BIG_V2

          Say 'Y' here if you want your kernel to support the
          Say 'Y' here if you want your kernel to support the

-         QNAP TS-119 and TS-219 Turbo NAS devices.
+         LaCie 5Big Network v2 NAS.

  
 +config MACH_DOCKSTAR
 +      bool "Seagate FreeAgent DockStar"
  
 +config MACH_DOCKSTAR
 +      bool "Seagate FreeAgent DockStar"


@@ -26,21 +24,18 @@ index 29b2163..74d832f 100644
 +        Seagate FreeAgent DockStar.
 +
  endmenu
 +        Seagate FreeAgent DockStar.
 +
  endmenu

-  
+ 

  endif
  endif

-diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
-index c0cd5d3..025b256 100644

 --- a/arch/arm/mach-kirkwood/Makefile
 +++ b/arch/arm/mach-kirkwood/Makefile
 --- a/arch/arm/mach-kirkwood/Makefile
 +++ b/arch/arm/mach-kirkwood/Makefile

-@@ -6,4 +6,5 @@ obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)    += sheevaplug-setup.o
+@@ -5,6 +5,7 @@ obj-$(CONFIG_MACH_RD88F6192_NAS)       += rd88
+ obj-$(CONFIG_MACH_RD88F6281)          += rd88f6281-setup.o
+ obj-$(CONFIG_MACH_MV88F6281GTW_GE)    += mv88f6281gtw_ge-setup.o

  obj-$(CONFIG_MACH_SHEEVAPLUG)         += sheevaplug-setup.o
  obj-$(CONFIG_MACH_SHEEVAPLUG)         += sheevaplug-setup.o

- obj-$(CONFIG_MACH_TS219)              += ts219-setup.o tsx1x-common.o

 +obj-$(CONFIG_MACH_DOCKSTAR)           += dockstar-setup.o
 +obj-$(CONFIG_MACH_DOCKSTAR)           += dockstar-setup.o

- 
- obj-$(CONFIG_CPU_IDLE)                        += cpuidle.o
-diff --git a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
-new file mode 100644
-index 0000000..a90475d
+ obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)   += sheevaplug-setup.o
+ obj-$(CONFIG_MACH_GURUPLUG)           += guruplug-setup.o
+ obj-$(CONFIG_MACH_TS219)              += ts219-setup.o tsx1x-common.o

 --- /dev/null
 +++ b/arch/arm/mach-kirkwood/dockstar-setup.c
 @@ -0,0 +1,148 @@
 --- /dev/null
 +++ b/arch/arm/mach-kirkwood/dockstar-setup.c
 @@ -0,0 +1,148 @@


@@ -192,15 +187,3 @@ index 0000000..a90475d
 +      .init_irq       = kirkwood_init_irq,
 +      .timer          = &kirkwood_timer,
 +MACHINE_END
 +      .init_irq       = kirkwood_init_irq,
 +      .timer          = &kirkwood_timer,
 +MACHINE_END

-diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
-index 48cbdcb..8d56837 100644
---- a/arch/arm/tools/mach-types
-+++ b/arch/arm/tools/mach-types
-@@ -2245,3 +2245,4 @@ davinci_dm365_dvr        MACH_DAVINCI_DM365_DVR  DAVINCI_DM365_DVR       2963
- omap3_wl_ff           MACH_OMAP3_WL_FF        OMAP3_WL_FF             2258
- simcom                        MACH_SIMCOM             SIMCOM                  2259
- mcwebio                       MACH_MCWEBIO            MCWEBIO                 2260
-+dockstar              MACH_DOCKSTAR           DOCKSTAR                2998
--- 
-1.7.1
-