aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-09 22:00:30 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-09 22:00:30 -0800
commit8a62519d04c31f0ef50d27c96252e9134e99f490 (patch)
tree53a94d3bbed988a4af1623dd466057aa2642f70c
parent23ff5a23f24df93300a44030a8d4308ce91e9871 (diff)
downloadltsi-kernel-8a62519d04c31f0ef50d27c96252e9134e99f490.tar.gz
more fuzz cleanup
-rw-r--r--patches.zynq/0014-arm-zynq-Migrate-platform-to-clock-controller.patch2
-rw-r--r--patches.zynq/0039-clk-add-CLK_SET_RATE_NO_REPARENT-flag.patch2
-rw-r--r--patches.zynq/0070-arm-dt-zynq-Add-support-for-the-zc706-platform.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/patches.zynq/0014-arm-zynq-Migrate-platform-to-clock-controller.patch b/patches.zynq/0014-arm-zynq-Migrate-platform-to-clock-controller.patch
index 8543de69ac624e..fb6ebca5e6f633 100644
--- a/patches.zynq/0014-arm-zynq-Migrate-platform-to-clock-controller.patch
+++ b/patches.zynq/0014-arm-zynq-Migrate-platform-to-clock-controller.patch
@@ -179,7 +179,7 @@ Signed-off-by: Yoshitake Kobayashi <yoshitake.kobayashi@toshiba.co.jp>
+obj-$(CONFIG_ARCH_ZYNQ) += zynq/
obj-$(CONFIG_ARCH_TEGRA) += tegra/
obj-$(CONFIG_PLAT_SAMSUNG) += samsung/
-
+ obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += shmobile/
--- /dev/null
+++ b/drivers/clk/zynq/Makefile
@@ -0,0 +1,3 @@
diff --git a/patches.zynq/0039-clk-add-CLK_SET_RATE_NO_REPARENT-flag.patch b/patches.zynq/0039-clk-add-CLK_SET_RATE_NO_REPARENT-flag.patch
index 7571adb9547e85..ec8840b5ca4473 100644
--- a/patches.zynq/0039-clk-add-CLK_SET_RATE_NO_REPARENT-flag.patch
+++ b/patches.zynq/0039-clk-add-CLK_SET_RATE_NO_REPARENT-flag.patch
@@ -234,7 +234,7 @@ Signed-off-by: Yoshitake Kobayashi <yoshitake.kobayashi@toshiba.co.jp>
0, 0, &dbgclk_lock);
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
-@@ -27,6 +27,7 @@
+@@ -28,6 +28,7 @@
#define CLK_IS_ROOT BIT(4) /* root clk, has no parent */
#define CLK_IS_BASIC BIT(5) /* Basic clk, can't do a to_clk_foo() */
#define CLK_GET_RATE_NOCACHE BIT(6) /* do not use the cached clk rate */
diff --git a/patches.zynq/0070-arm-dt-zynq-Add-support-for-the-zc706-platform.patch b/patches.zynq/0070-arm-dt-zynq-Add-support-for-the-zc706-platform.patch
index 0754279e94a359..adaaecadb53c69 100644
--- a/patches.zynq/0070-arm-dt-zynq-Add-support-for-the-zc706-platform.patch
+++ b/patches.zynq/0070-arm-dt-zynq-Add-support-for-the-zc706-platform.patch
@@ -20,7 +20,7 @@ Signed-off-by: Yoshitake Kobayashi <yoshitake.kobayashi@toshiba.co.jp>
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
-@@ -216,7 +216,8 @@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07
+@@ -219,7 +219,8 @@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07
wm8505-ref.dtb \
wm8650-mid.dtb \
wm8850-w70v2.dtb