]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
clk: at91: fix h32mx prototype inclusion in pmc header
authorNicolas Ferre <nicolas.ferre@atmel.com>
Thu, 28 May 2015 13:07:21 +0000 (15:07 +0200)
committerSasha Levin <sasha.levin@oracle.com>
Wed, 1 Jul 2015 19:37:14 +0000 (15:37 -0400)
[ Upstream commit 28df9c2fb6f896179fcffd5a3f5a86e2d1dff0a5 ]

Trivial fix that prevents to compile this pmc clock driver if h32mx clock is
present but smd clock isn't.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Fixes: bcc5fd49a0fd ("clk: at91: add a driver for the h32mx clock")
Cc: <stable@vger.kernel.org> # 3.18+
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/clk/at91/pmc.h

index 52d2041fa3f6354a4abfdc8f45ee147a75a370ef..af2c9919554171e5222973506cd895759a7b34c4 100644 (file)
@@ -120,7 +120,7 @@ extern void __init of_at91sam9x5_clk_smd_setup(struct device_node *np,
                                               struct at91_pmc *pmc);
 #endif
 
-#if defined(CONFIG_HAVE_AT91_SMD)
+#if defined(CONFIG_HAVE_AT91_H32MX)
 extern void __init of_sama5d4_clk_h32mx_setup(struct device_node *np,
                                              struct at91_pmc *pmc);
 #endif