1 files changed, 149 insertions, 0 deletions
diff --git a/patches.renesas/0130-clk-shmobile-Remove-unneeded-include-linux-clkdev.h.patch b/patches.renesas/0130-clk-shmobile-Remove-unneeded-include-linux-clkdev.h.patch
new file mode 100644
index 00000000000000..3104e230468ee6
--- /dev/null
+++ b/patches.renesas/0130-clk-shmobile-Remove-unneeded-include-linux-clkdev.h.patch
@@ -0,0 +1,149 @@
+From d3d10c1571835d1a74d8746d3c2d0f2c83fd35f3 Mon Sep 17 00:00:00 2001
+From: Geert Uytterhoeven <geert+renesas@glider.be>
+Date: Tue, 23 Jun 2015 15:09:27 +0200
+Subject: [PATCH 130/326] clk: shmobile: Remove unneeded #include
+ <linux/clkdev.h>
+
+The CCF implementations for the various shmobile SoCs don't use clkdev
+functionality, hence drop the inclusion of <linux/clkdev.h>.
+
+Add the missing #include <linux/slab.h>, which was included implicitly
+through <asm/clkdev.h> before.
+
+Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
+Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
+(cherry picked from commit 5a1cfafaeab5237523d43cd033e1fb42bf5c1933)
+Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
+---
+ drivers/clk/shmobile/clk-div6.c      | 2 +-
+ drivers/clk/shmobile/clk-r8a73a4.c   | 2 +-
+ drivers/clk/shmobile/clk-r8a7740.c   | 2 +-
+ drivers/clk/shmobile/clk-r8a7778.c   | 2 +-
+ drivers/clk/shmobile/clk-r8a7779.c   | 2 +-
+ drivers/clk/shmobile/clk-rcar-gen2.c | 2 +-
+ drivers/clk/shmobile/clk-sh73a0.c    | 2 +-
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/clk/shmobile/clk-div6.c b/drivers/clk/shmobile/clk-div6.c
+index 036a692c7219..6810bfb6ef5e 100644
+--- a/drivers/clk/shmobile/clk-div6.c
++++ b/drivers/clk/shmobile/clk-div6.c
+@@ -11,12 +11,12 @@
+  */
+ 
+ #include <linux/clk-provider.h>
+-#include <linux/clkdev.h>
+ #include <linux/init.h>
+ #include <linux/io.h>
+ #include <linux/kernel.h>
+ #include <linux/of.h>
+ #include <linux/of_address.h>
++#include <linux/slab.h>
+ 
+ #define CPG_DIV6_CKSTP		BIT(8)
+ #define CPG_DIV6_DIV(d)		((d) & 0x3f)
+diff --git a/drivers/clk/shmobile/clk-r8a73a4.c b/drivers/clk/shmobile/clk-r8a73a4.c
+index 29b9a0b0012a..9326204bed9d 100644
+--- a/drivers/clk/shmobile/clk-r8a73a4.c
++++ b/drivers/clk/shmobile/clk-r8a73a4.c
+@@ -9,10 +9,10 @@
+  */
+ 
+ #include <linux/clk-provider.h>
+-#include <linux/clkdev.h>
+ #include <linux/clk/shmobile.h>
+ #include <linux/init.h>
+ #include <linux/kernel.h>
++#include <linux/slab.h>
+ #include <linux/of.h>
+ #include <linux/of_address.h>
+ #include <linux/spinlock.h>
+diff --git a/drivers/clk/shmobile/clk-r8a7740.c b/drivers/clk/shmobile/clk-r8a7740.c
+index 1e2eaae21e01..1e6b1da58065 100644
+--- a/drivers/clk/shmobile/clk-r8a7740.c
++++ b/drivers/clk/shmobile/clk-r8a7740.c
+@@ -9,10 +9,10 @@
+  */
+ 
+ #include <linux/clk-provider.h>
+-#include <linux/clkdev.h>
+ #include <linux/clk/shmobile.h>
+ #include <linux/init.h>
+ #include <linux/kernel.h>
++#include <linux/slab.h>
+ #include <linux/of.h>
+ #include <linux/of_address.h>
+ #include <linux/spinlock.h>
+diff --git a/drivers/clk/shmobile/clk-r8a7778.c b/drivers/clk/shmobile/clk-r8a7778.c
+index cb33b57274bf..e97e28fcfc13 100644
+--- a/drivers/clk/shmobile/clk-r8a7778.c
++++ b/drivers/clk/shmobile/clk-r8a7778.c
+@@ -9,9 +9,9 @@
+  */
+ 
+ #include <linux/clk-provider.h>
+-#include <linux/clkdev.h>
+ #include <linux/clk/shmobile.h>
+ #include <linux/of_address.h>
++#include <linux/slab.h>
+ 
+ struct r8a7778_cpg {
+ 	struct clk_onecell_data data;
+diff --git a/drivers/clk/shmobile/clk-r8a7779.c b/drivers/clk/shmobile/clk-r8a7779.c
+index 652ecacb6daf..af297963489f 100644
+--- a/drivers/clk/shmobile/clk-r8a7779.c
++++ b/drivers/clk/shmobile/clk-r8a7779.c
+@@ -11,12 +11,12 @@
+  */
+ 
+ #include <linux/clk-provider.h>
+-#include <linux/clkdev.h>
+ #include <linux/clk/shmobile.h>
+ #include <linux/init.h>
+ #include <linux/kernel.h>
+ #include <linux/of.h>
+ #include <linux/of_address.h>
++#include <linux/slab.h>
+ #include <linux/spinlock.h>
+ 
+ #include <dt-bindings/clock/r8a7779-clock.h>
+diff --git a/drivers/clk/shmobile/clk-rcar-gen2.c b/drivers/clk/shmobile/clk-rcar-gen2.c
+index acfb6d7dbd6b..9233ebf8cc49 100644
+--- a/drivers/clk/shmobile/clk-rcar-gen2.c
++++ b/drivers/clk/shmobile/clk-rcar-gen2.c
+@@ -11,13 +11,13 @@
+  */
+ 
+ #include <linux/clk-provider.h>
+-#include <linux/clkdev.h>
+ #include <linux/clk/shmobile.h>
+ #include <linux/init.h>
+ #include <linux/kernel.h>
+ #include <linux/math64.h>
+ #include <linux/of.h>
+ #include <linux/of_address.h>
++#include <linux/slab.h>
+ #include <linux/spinlock.h>
+ 
+ struct rcar_gen2_cpg {
+diff --git a/drivers/clk/shmobile/clk-sh73a0.c b/drivers/clk/shmobile/clk-sh73a0.c
+index cd529cfe412f..8966f8bbfd72 100644
+--- a/drivers/clk/shmobile/clk-sh73a0.c
++++ b/drivers/clk/shmobile/clk-sh73a0.c
+@@ -9,12 +9,12 @@
+  */
+ 
+ #include <linux/clk-provider.h>
+-#include <linux/clkdev.h>
+ #include <linux/clk/shmobile.h>
+ #include <linux/init.h>
+ #include <linux/kernel.h>
+ #include <linux/of.h>
+ #include <linux/of_address.h>
++#include <linux/slab.h>
+ #include <linux/spinlock.h>
+ 
+ struct sh73a0_cpg {
+-- 
+2.6.2
+