From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 20 Feb 2014 22:32:04 +0000 (-0800)
Subject: 3.13-stable patches
X-Git-Tag: v3.4.82~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ad1b0b6fca1c226f8e388601512d5182af849c7;p=thirdparty%2Fkernel%2Fstable-queue.git

3.13-stable patches

added patches:
	arm-pxa-fix-compilation-problem-on-am300epd-board.patch
---

diff --git a/queue-3.13/arm-pxa-fix-compilation-problem-on-am300epd-board.patch b/queue-3.13/arm-pxa-fix-compilation-problem-on-am300epd-board.patch
new file mode 100644
index 00000000000..537c272f8e2
--- /dev/null
+++ b/queue-3.13/arm-pxa-fix-compilation-problem-on-am300epd-board.patch
@@ -0,0 +1,43 @@
+From 29ffa48fa64fcdfc71d80593c8ae79248bc27677 Mon Sep 17 00:00:00 2001
+From: Linus Walleij <linus.walleij@linaro.org>
+Date: Tue, 4 Feb 2014 13:30:05 +0100
+Subject: ARM: pxa: fix compilation problem on AM300EPD board
+
+From: Linus Walleij <linus.walleij@linaro.org>
+
+commit 29ffa48fa64fcdfc71d80593c8ae79248bc27677 upstream.
+
+This board fails compilation like this:
+arch/arm/mach-pxa/am300epd.c: In function ‘am300_cleanup’:
+arch/arm/mach-pxa/am300epd.c:179:2: error: implicit declaration
+of function ‘PXA_GPIO_TO_IRQ’ [-Werror=implicit-function-declaration]
+  free_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), par);
+
+This was caused by commit 88f718e3fa4d67f3a8dbe79a2f97d722323e4051
+"ARM: pxa: delete the custom GPIO header"
+
+This is because it was previously getting the macro PXA_GPIO_TO_IRQ
+implicitly from <linux/gpio.h> which in turn implicitly included
+<mach/gpio.h> which in turn included <mach/irqs.h>.
+
+Add the missing include so that the board compiles again.
+
+Reported-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Signed-off-by: Kevin Hilman <khilman@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/mach-pxa/am300epd.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/arm/mach-pxa/am300epd.c
++++ b/arch/arm/mach-pxa/am300epd.c
+@@ -30,6 +30,7 @@
+ 
+ #include <mach/gumstix.h>
+ #include <mach/mfp-pxa25x.h>
++#include <mach/irqs.h>
+ #include <linux/platform_data/video-pxafb.h>
+ 
+ #include "generic.h"
diff --git a/queue-3.13/series b/queue-3.13/series
index b499f7c42f5..8045031b173 100644
--- a/queue-3.13/series
+++ b/queue-3.13/series
@@ -44,3 +44,4 @@ drm-radeon-cik-use-poll_reg_mem-special-op-for-sdma-hdp.patch
 vt-fix-secure-clear-screen.patch
 serial-omap-serial-move-info-message-to-probe-function.patch
 usb-qcserial-add-netgear-aircard-340u.patch
+arm-pxa-fix-compilation-problem-on-am300epd-board.patch