stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Patch "clk: at91: fix h32mx prototype inclusion in pmc header" has been added to the 4.0-stable tree
@ 2015-06-23  3:25 gregkh
  0 siblings, 0 replies; only message in thread
From: gregkh @ 2015-06-23  3:25 UTC (permalink / raw)
  To: nicolas.ferre, alexandre.belloni, boris.brezillon, gregkh
  Cc: stable, stable-commits


This is a note to let you know that I've just added the patch titled

    clk: at91: fix h32mx prototype inclusion in pmc header

to the 4.0-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     clk-at91-fix-h32mx-prototype-inclusion-in-pmc-header.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


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

From: Nicolas Ferre <nicolas.ferre@atmel.com>

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@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")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/clk/at91/pmc.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/clk/at91/pmc.h
+++ b/drivers/clk/at91/pmc.h
@@ -121,7 +121,7 @@ extern void __init of_at91sam9x5_clk_smd
 					       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


Patches currently in stable-queue which might be from nicolas.ferre@atmel.com are

queue-4.0/clk-at91-fix-h32mx-prototype-inclusion-in-pmc-header.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-06-23  3:28 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-23  3:25 Patch "clk: at91: fix h32mx prototype inclusion in pmc header" has been added to the 4.0-stable tree gregkh

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).