summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-04-28 06:42:20 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-04-28 06:42:20 +0200
commit53971a86d2db89f32859dc26bd6594b5bc665d5b (patch)
tree350ee9f3d53494036308cd123054dac3ba86ff91 /arch/arm/mach-pxa
parentusb: dwc2: fix sparse warning (diff)
parentLinux 3.15-rc3 (diff)
downloadlinux-53971a86d2db89f32859dc26bd6594b5bc665d5b.tar.xz
linux-53971a86d2db89f32859dc26bd6594b5bc665d5b.zip
Merge 3.15-rc3 into usb-next
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r--arch/arm/mach-pxa/include/mach/hx4700.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/hx4700.h b/arch/arm/mach-pxa/include/mach/hx4700.h
index 8bc02913517c..0e1bb46264f9 100644
--- a/arch/arm/mach-pxa/include/mach/hx4700.h
+++ b/arch/arm/mach-pxa/include/mach/hx4700.h
@@ -14,6 +14,7 @@
#include <linux/gpio.h>
#include <linux/mfd/asic3.h>
+#include "irqs.h" /* PXA_NR_BUILTIN_GPIO */
#define HX4700_ASIC3_GPIO_BASE PXA_NR_BUILTIN_GPIO
#define HX4700_EGPIO_BASE (HX4700_ASIC3_GPIO_BASE + ASIC3_NUM_GPIOS)