summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/include/mach/tosa.h
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-02-04 13:53:07 +0100
committerKevin Hilman <khilman@linaro.org>2014-02-10 19:33:04 +0100
commit9705e74671f0e4f994d86b00cecf441917c64a66 (patch)
treec938cc1bd3638e8fcaffd0ff5de72182493d9d7a /arch/arm/mach-pxa/include/mach/tosa.h
parentARM: pxa: fix compilation problem on AM300EPD board (diff)
downloadlinux-9705e74671f0e4f994d86b00cecf441917c64a66.tar.xz
linux-9705e74671f0e4f994d86b00cecf441917c64a66.zip
ARM: pxa: fix various compilation problems
Due to commit 88f718e3fa4d67f3a8dbe79a2f97d722323e4051 "ARM: pxa: delete the custom GPIO header" some drivers fail compilation, for example like this: In file included from sound/soc/pxa/spitz.c:28:0: sound/soc/pxa/spitz.c: In function ‘spitz_ext_control’: arch/arm/mach-pxa/include/mach/spitz.h:111:30: error: ‘PXA_NR_BUILTIN_GPIO’ undeclared (first use in this function) #define SPITZ_SCP_GPIO_BASE (PXA_NR_BUILTIN_GPIO) (etc.) This is caused by implicit inclusion of <mach/irqs.h> from various board-specific headers under <mach/*> in the PXA platform. So we take a sweep over these, and for every such header that uses PXA_NR_BUILTIN_GPIO or PXA_GPIO_TO_IRQ() we explicitly #include "irqs.h" so that we satisfy the dependency in the board include file alone. Reported-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Cc: stable@vger.kernel.org # v3.13+ Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/tosa.h')
-rw-r--r--arch/arm/mach-pxa/include/mach/tosa.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/tosa.h b/arch/arm/mach-pxa/include/mach/tosa.h
index 2bb0e862598c..0497d95cef25 100644
--- a/arch/arm/mach-pxa/include/mach/tosa.h
+++ b/arch/arm/mach-pxa/include/mach/tosa.h
@@ -13,6 +13,8 @@
#ifndef _ASM_ARCH_TOSA_H_
#define _ASM_ARCH_TOSA_H_ 1
+#include "irqs.h" /* PXA_NR_BUILTIN_GPIO */
+
/* TOSA Chip selects */
#define TOSA_LCDC_PHYS PXA_CS4_PHYS
/* Internel Scoop */