These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / clk / mxs / clk.h

diff --git a/kernel/drivers/clk/mxs/clk.h b/kernel/drivers/clk/mxs/clk.h
index ef10ad9..a459095 100644 (file)
--- a/kernel/drivers/clk/mxs/clk.h
+++ b/kernel/drivers/clk/mxs/clk.h
@@ -12,7 +12,8 @@
 #ifndef __MXS_CLK_H
 #define __MXS_CLK_H
 
-#include <linux/clk.h>
+struct clk;
+
 #include <linux/clk-provider.h>
 #include <linux/spinlock.h>
 
@@ -49,7 +50,7 @@ static inline struct clk *mxs_clk_gate(const char *name,
 }
 
 static inline struct clk *mxs_clk_mux(const char *name, void __iomem *reg,
-               u8 shift, u8 width, const char **parent_names, int num_parents)
+               u8 shift, u8 width, const char *const *parent_names, int num_parents)
 {
        return clk_register_mux(NULL, name, parent_names, num_parents,
                                CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT,