From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:40013 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753350AbbFWD2k (ORCPT ); Mon, 22 Jun 2015 23:28:40 -0400 Subject: Patch "clk: at91: fix h32mx prototype inclusion in pmc header" has been added to the 4.0-stable tree To: nicolas.ferre@atmel.com, alexandre.belloni@free-electrons.com, boris.brezillon@free-electrons.com, gregkh@linuxfoundation.org Cc: , From: Date: Mon, 22 Jun 2015 20:25:50 -0700 Message-ID: <143502995016122@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From 28df9c2fb6f896179fcffd5a3f5a86e2d1dff0a5 Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Thu, 28 May 2015 15:07:21 +0200 Subject: clk: at91: fix h32mx prototype inclusion in pmc header From: Nicolas Ferre 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 Signed-off-by: Boris Brezillon Acked-by: Alexandre Belloni Fixes: bcc5fd49a0fd ("clk: at91: add a driver for the h32mx clock") Signed-off-by: Greg Kroah-Hartman --- 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