more fuzz cleanup
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Jan 2014 06:00:30 +0000 (22:00 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Jan 2014 06:00:30 +0000 (22:00 -0800)
patches.zynq/0014-arm-zynq-Migrate-platform-to-clock-controller.patch
patches.zynq/0039-clk-add-CLK_SET_RATE_NO_REPARENT-flag.patch
patches.zynq/0070-arm-dt-zynq-Add-support-for-the-zc706-platform.patch

index 8543de69ac624e21b075c64bebd6daed679a8f1a..fb6ebca5e6f633917a5454b56d5b2202c2d3ecdd 100644 (file)
@@ -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 @@
index 7571adb9547e85873a10a579760229b5db2f5a17..ec8840b5ca447331fc98ad0a81fd643f131dd521 100644 (file)
@@ -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 */
index 0754279e94a3599d27c1e6f35ef28887e7f3fdbe..adaaecadb53c691cf3939e0ef3540b05f987e232 100644 (file)
@@ -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