[3.19.y-ckt stable] Patch "clk: at91: fix h32mx prototype inclusion in pmc header" has been added to staging queue

[Kamal Mostafa]

This is a note to let you know that I have just added a patch titled

    clk: at91: fix h32mx prototype inclusion in pmc header

to the linux-3.19.y-queue branch of the 3.19.y-ckt extended stable tree 
which can be found at:

    http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.19.y-queue

This patch is scheduled to be released in version 3.19.8-ckt3.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.19.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From 44287b3b8c342740ffea6b340b99d76414ecc3bd Mon Sep 17 00:00:00 2001
From: Nicolas Ferre <nicolas.ferre at atmel.com>
Date: Thu, 28 May 2015 15:07:21 +0200
Subject: clk: at91: fix h32mx prototype inclusion in pmc header

commit 28df9c2fb6f896179fcffd5a3f5a86e2d1dff0a5 upstream.

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 at atmel.com>
Signed-off-by: Boris Brezillon <boris.brezillon at free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni at free-electrons.com>
Fixes: bcc5fd49a0fd ("clk: at91: add a driver for the h32mx clock")
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 drivers/clk/at91/pmc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h
index 52d2041..af2c991 100644
--- a/drivers/clk/at91/pmc.h
+++ b/drivers/clk/at91/pmc.h
@@ -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
--
1.9.1