Merge remote-tracking branch 'nouveau/drm-nouveau-next' into drm-fixes

[deliverable/linux.git] / drivers / clk / clk-prima2.c

diff --git a/drivers/clk/clk-prima2.c b/drivers/clk/clk-prima2.c
index 643ca653fef026b2de60235a1ef401e67c88148a..5ab95f1ad579288c516dc782b14a2b5a871ad7dc 100644 (file)
--- a/drivers/clk/clk-prima2.c
+++ b/drivers/clk/clk-prima2.c
@@ -1034,7 +1034,7 @@ enum prima2_clk_index {
        usb0,  usb1,  maxclk,
 };
 
-static __initdata struct clk_hw* prima2_clk_hw_array[maxclk] = {
+static struct clk_hw *prima2_clk_hw_array[maxclk] __initdata = {
        NULL, /* dummy */
        NULL,
        &clk_pll1.hw,