kernel: kirkwood: fix legacy boot patch for dreamplug.

diff --git a/src/patches/linux-3.14.22-kirkwood_legacy_boot.patch b/src/patches/linux-3.14.22-kirkwood_legacy_boot.patch
index 27dfeddca1b9517d023df804f2317d1670d77e41..97b2cc1f27ef69424427a3b83e6c059d9c3c8363 100644 (file)
--- a/src/patches/linux-3.14.22-kirkwood_legacy_boot.patch
+++ b/src/patches/linux-3.14.22-kirkwood_legacy_boot.patch
@@ -1,6 +1,6 @@
 diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/db88f6281-bp-setup.c linux-3.14.22/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
 --- linux-3.14.22.org/arch/arm/mach-kirkwood/db88f6281-bp-setup.c      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.14.22/arch/arm/mach-kirkwood/db88f6281-bp-setup.c  2014-10-15 08:32:29.000000000 +0200
++++ linux-3.14.22/arch/arm/mach-kirkwood/db88f6281-bp-setup.c  2014-11-05 22:07:58.828714499 +0100
 @@ -0,0 +1,108 @@
 +/*
 + * arch/arm/mach-kirkwood/db88f6281-bp-setup.c
@@ -112,7 +112,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/db88f6281-bp-setup.c linux-3
 +MACHINE_END
 diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/dockstar-setup.c linux-3.14.22/arch/arm/mach-kirkwood/dockstar-setup.c
 --- linux-3.14.22.org/arch/arm/mach-kirkwood/dockstar-setup.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.14.22/arch/arm/mach-kirkwood/dockstar-setup.c      2014-10-15 08:32:29.000000000 +0200
++++ linux-3.14.22/arch/arm/mach-kirkwood/dockstar-setup.c      2014-11-05 22:07:58.828714499 +0100
 @@ -0,0 +1,111 @@
 +/*
 + * arch/arm/mach-kirkwood/dockstar-setup.c
@@ -227,7 +227,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/dockstar-setup.c linux-3.14.
 +MACHINE_END
 diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/dreamplug-setup.c linux-3.14.22/arch/arm/mach-kirkwood/dreamplug-setup.c
 --- linux-3.14.22.org/arch/arm/mach-kirkwood/dreamplug-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.14.22/arch/arm/mach-kirkwood/dreamplug-setup.c     2014-11-04 00:25:48.383688273 +0100
++++ linux-3.14.22/arch/arm/mach-kirkwood/dreamplug-setup.c     2014-11-05 22:07:58.833714499 +0100
 @@ -0,0 +1,151 @@
 +/*
 + * arch/arm/mach-kirkwood/dreamplug-setup.c
@@ -382,7 +382,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/dreamplug-setup.c linux-3.14
 +MACHINE_END
 diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/guruplug-setup.c linux-3.14.22/arch/arm/mach-kirkwood/guruplug-setup.c
 --- linux-3.14.22.org/arch/arm/mach-kirkwood/guruplug-setup.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.14.22/arch/arm/mach-kirkwood/guruplug-setup.c      2014-11-04 00:25:48.383688273 +0100
++++ linux-3.14.22/arch/arm/mach-kirkwood/guruplug-setup.c      2014-11-05 22:07:58.838714499 +0100
 @@ -0,0 +1,135 @@
 +/*
 + * arch/arm/mach-kirkwood/guruplug-setup.c
@@ -521,7 +521,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/guruplug-setup.c linux-3.14.
 +MACHINE_END
 diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/iconnect-setup.c linux-3.14.22/arch/arm/mach-kirkwood/iconnect-setup.c
 --- linux-3.14.22.org/arch/arm/mach-kirkwood/iconnect-setup.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.14.22/arch/arm/mach-kirkwood/iconnect-setup.c      2014-11-04 00:25:48.383688273 +0100
++++ linux-3.14.22/arch/arm/mach-kirkwood/iconnect-setup.c      2014-11-05 22:07:58.843714499 +0100
 @@ -0,0 +1,214 @@
 +/*
 + * arch/arm/mach-kirkwood/iconnect-setup.c
@@ -739,7 +739,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/iconnect-setup.c linux-3.14.
 +MACHINE_END
 diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/Kconfig linux-3.14.22/arch/arm/mach-kirkwood/Kconfig
 --- linux-3.14.22.org/arch/arm/mach-kirkwood/Kconfig   2014-10-15 08:42:04.000000000 +0200
-+++ linux-3.14.22/arch/arm/mach-kirkwood/Kconfig       2014-11-04 01:10:52.950526196 +0100
++++ linux-3.14.22/arch/arm/mach-kirkwood/Kconfig       2014-11-05 22:07:58.848714499 +0100
 @@ -1,3 +1,5 @@
 +
 +
@@ -840,8 +840,8 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/Kconfig linux-3.14.22/arch/a
  endif
 diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/Makefile linux-3.14.22/arch/arm/mach-kirkwood/Makefile
 --- linux-3.14.22.org/arch/arm/mach-kirkwood/Makefile  2014-10-15 08:42:04.000000000 +0200
-+++ linux-3.14.22/arch/arm/mach-kirkwood/Makefile      2014-11-04 01:11:13.009019440 +0100
-@@ -2,6 +2,14 @@
++++ linux-3.14.22/arch/arm/mach-kirkwood/Makefile      2014-11-05 22:09:01.758714529 +0100
+@@ -2,6 +2,15 @@
  obj-$(CONFIG_KIRKWOOD_LEGACY) += irq.o mpp.o
  obj-$(CONFIG_PM)              += pm.o
  
@@ -849,6 +849,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/Makefile linux-3.14.22/arch/
 +obj-$(CONFIG_MACH_DOCKSTAR)           += dockstar-setup.o
 +obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)   += sheevaplug-setup.o
 +obj-$(CONFIG_MACH_GURUPLUG)           += guruplug-setup.o
++obj-$(CONFIG_MACH_DREAMPLUG)          += dreamplug-setup.o
 +obj-$(CONFIG_MACH_INETSPACE_V2)               += netspace_v2-setup.o lacie_v2-common.o
 +obj-$(CONFIG_MACH_NETSPACE_MAX_V2)    += netspace_v2-setup.o lacie_v2-common.o
 +obj-$(CONFIG_MACH_NETSPACE_V2)                += netspace_v2-setup.o lacie_v2-common.o
@@ -856,7 +857,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/Makefile linux-3.14.22/arch/
  obj-$(CONFIG_MACH_D2NET_V2)           += d2net_v2-setup.o lacie_v2-common.o
  obj-$(CONFIG_MACH_NET2BIG_V2)         += netxbig_v2-setup.o lacie_v2-common.o
  obj-$(CONFIG_MACH_NET5BIG_V2)         += netxbig_v2-setup.o lacie_v2-common.o
-@@ -11,6 +19,8 @@
+@@ -11,6 +20,8 @@
  obj-$(CONFIG_MACH_T5325)              += t5325-setup.o
  obj-$(CONFIG_MACH_TS219)              += ts219-setup.o tsx1x-common.o
  obj-$(CONFIG_MACH_TS41X)              += ts41x-setup.o tsx1x-common.o
@@ -867,7 +868,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/Makefile linux-3.14.22/arch/
  obj-$(CONFIG_MACH_MV88F6281GTW_GE_DT) += board-mv88f6281gtw_ge.o
 diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/nas6210-setup.c linux-3.14.22/arch/arm/mach-kirkwood/nas6210-setup.c
 --- linux-3.14.22.org/arch/arm/mach-kirkwood/nas6210-setup.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.14.22/arch/arm/mach-kirkwood/nas6210-setup.c       2014-11-04 00:25:48.393687522 +0100
++++ linux-3.14.22/arch/arm/mach-kirkwood/nas6210-setup.c       2014-11-05 22:07:58.858714499 +0100
 @@ -0,0 +1,185 @@
 +/*
 + * arch/arm/mach-kirkwood/nas6210-setup.c
@@ -1056,7 +1057,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/nas6210-setup.c linux-3.14.2
 +MACHINE_END
 diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/netspace_v2-setup.c linux-3.14.22/arch/arm/mach-kirkwood/netspace_v2-setup.c
 --- linux-3.14.22.org/arch/arm/mach-kirkwood/netspace_v2-setup.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.14.22/arch/arm/mach-kirkwood/netspace_v2-setup.c   2014-10-15 08:32:29.000000000 +0200
++++ linux-3.14.22/arch/arm/mach-kirkwood/netspace_v2-setup.c   2014-11-05 22:07:58.858714499 +0100
 @@ -0,0 +1,293 @@
 +/*
 + * arch/arm/mach-kirkwood/netspace_v2-setup.c
@@ -1353,7 +1354,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/netspace_v2-setup.c linux-3.
 +#endif
 diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/sheevaplug-setup.c linux-3.14.22/arch/arm/mach-kirkwood/sheevaplug-setup.c
 --- linux-3.14.22.org/arch/arm/mach-kirkwood/sheevaplug-setup.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.14.22/arch/arm/mach-kirkwood/sheevaplug-setup.c    2014-10-15 08:32:29.000000000 +0200
++++ linux-3.14.22/arch/arm/mach-kirkwood/sheevaplug-setup.c    2014-11-05 22:07:58.868714499 +0100
 @@ -0,0 +1,161 @@
 +/*
 + * arch/arm/mach-kirkwood/sheevaplug-setup.c
@@ -1518,7 +1519,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/sheevaplug-setup.c linux-3.1
 +#endif
 diff -Naur linux-3.14.22.org/arch/arm/tools/mach-types linux-3.14.22/arch/arm/tools/mach-types
 --- linux-3.14.22.org/arch/arm/tools/mach-types        2014-10-15 08:42:04.000000000 +0200
-+++ linux-3.14.22/arch/arm/tools/mach-types    2014-11-04 00:25:48.393687522 +0100
++++ linux-3.14.22/arch/arm/tools/mach-types    2014-11-05 22:07:58.868714499 +0100
 @@ -447,6 +447,7 @@
  smartq5                       MACH_SMARTQ5            SMARTQ5                 2534
  davinci_dm6467tevm    MACH_DAVINCI_DM6467TEVM DAVINCI_DM6467TEVM      2548