From: Greg Kroah-Hartman Date: Fri, 10 Jan 2014 06:00:30 +0000 (-0800) Subject: more fuzz cleanup X-Git-Tag: v3.10.28-ltsi-rc1~9^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8a62519d04c31f0ef50d27c96252e9134e99f490;p=platform%2Fkernel%2Flinux-stable.git more fuzz cleanup --- 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 8543de69ac62..fb6ebca5e6f6 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 +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 7571adb9547e..ec8840b5ca44 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 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 0754279e94a3..adaaecadb53c 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 --- 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