diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-05-17 21:07:33 +0200 |
|---|---|---|
| committer | Philippe LANGLAIS <philippe.langlais@stericsson.com> | 2011-05-27 16:17:04 +0200 |
| commit | a1fc3af865eba0374eca0a977d9f2b681950ee97 (patch) | |
| tree | 3397312605f34e00b3f95fc5f8f946f73fe3cdcc /arch/arm/mach-ux500/include/mach | |
| parent | f0d2330c361a9fd946938969c32e3fd48bb8559c (diff) | |
mach-ux500: gpio: Moved the NOMADIK_NR_GPIO
Move the NOMADIK_NR_GPIO to the right
location.
Fix warnings generated by this change.
ST-Ericsson Linux next: ER 340134
ST-Ericsson ID: 340139
ST-Ericsson FOSS-OUT ID: Trivial
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Change-Id: I5b69d4a4662b707d815a867b2b5be19e4675d010
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24082
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/include/mach')
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/gpio.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/irqs-board-mop500.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/msp.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/include/mach/gpio.h b/arch/arm/mach-ux500/include/mach/gpio.h index b91f296b452..0242501650f 100644 --- a/arch/arm/mach-ux500/include/mach/gpio.h +++ b/arch/arm/mach-ux500/include/mach/gpio.h @@ -6,6 +6,7 @@ * room for a couple of GPIO expanders. */ #define ARCH_NR_GPIOS 355 +#define NOMADIK_NR_GPIO 288 #include <plat/gpio.h> diff --git a/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h b/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h index 52e1e4aad25..4c7d188cbc0 100644 --- a/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h +++ b/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h @@ -10,6 +10,7 @@ /* Number of AB8500 irqs is taken from header file */ #include <linux/mfd/ab8500.h> +#include <linux/gpio.h> #define IRQ_LOCALTIMER 29 #define IRQ_LOCALWDOG 30 @@ -26,7 +27,6 @@ #define DBX500_NR_INTERNAL_IRQS 160 /* After chip-specific IRQ numbers we have the GPIO ones */ -#define NOMADIK_NR_GPIO 288 #define NOMADIK_GPIO_TO_IRQ(gpio) ((gpio) + DBX500_NR_INTERNAL_IRQS) #define NOMADIK_IRQ_TO_GPIO(irq) ((irq) - DBX500_NR_INTERNAL_IRQS) #define IRQ_GPIO_END NOMADIK_GPIO_TO_IRQ(NOMADIK_NR_GPIO) diff --git a/arch/arm/mach-ux500/include/mach/msp.h b/arch/arm/mach-ux500/include/mach/msp.h index aecca3a59a3..ce6ec08e08d 100644 --- a/arch/arm/mach-ux500/include/mach/msp.h +++ b/arch/arm/mach-ux500/include/mach/msp.h @@ -16,7 +16,7 @@ #include <linux/irqreturn.h> #include <linux/bitops.h> #include <plat/ste_dma40.h> -#include <mach/gpio.h> +#include <linux/gpio.h> #include <linux/spi/stm_msp.h> /* Generic config struct. Use the actual values defined below for global |