kernel: update 3.18 to 3.18.14

[openwrt/svn-archive/archive.git] / target / linux / gemini / patches-3.18 / 021-reset-parameters.patch

diff --git a/target/linux/gemini/patches-3.18/021-reset-parameters.patch b/target/linux/gemini/patches-3.18/021-reset-parameters.patch
index b466badd672ec0b33e69fdc713366309cd3ff737..644e513746bb3e10c107b978fa8fc590fe59f58c 100644 (file)
--- a/target/linux/gemini/patches-3.18/021-reset-parameters.patch
+++ b/target/linux/gemini/patches-3.18/021-reset-parameters.patch
@@ -13,9 +13,9 @@
  {
        __raw_writel(RESET_GLOBAL | RESET_CPU1,
                     IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_RESET);
---- a/arch/arm/mach-gemini/common.h    2014-08-23 07:06:06.014200638 -0500
-+++ b/arch/arm/mach-gemini/common.h    2014-08-23 07:07:33.450536466 -0500
-@@ -26,6 +26,6 @@
+--- a/arch/arm/mach-gemini/common.h
++++ b/arch/arm/mach-gemini/common.h
+@@ -26,6 +26,6 @@ extern int platform_register_pflash(unsi
                                    struct mtd_partition *parts,
                                    unsigned int nr_parts);