diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-10-13 16:21:57 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:01:55 +0200 |
| commit | 18f9738edbc826058533d40a8f33817d0e8829d4 (patch) | |
| tree | 265a8db4195e1197a41f2f20eddf83fc0e614eca | |
| parent | c13a13f0f5e77538ca7f9e6a1dbbc7a1a480e90b (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>
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-u8500uib.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/cpu-db5500.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/irqs-board-mop500.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-u8500uib.c b/arch/arm/mach-ux500/board-mop500-u8500uib.c index d1dd9941cbf..e9ec96998f3 100644 --- a/arch/arm/mach-ux500/board-mop500-u8500uib.c +++ b/arch/arm/mach-ux500/board-mop500-u8500uib.c @@ -15,7 +15,7 @@ #include <linux/input/matrix_keypad.h> #include <asm/mach-types.h> -#include <mach/gpio.h> +#include <linux/gpio.h> #include <mach/irqs.h> #include "board-mop500.h" diff --git a/arch/arm/mach-ux500/cpu-db5500.c b/arch/arm/mach-ux500/cpu-db5500.c index adb00505392..d09e81d1fec 100644 --- a/arch/arm/mach-ux500/cpu-db5500.c +++ b/arch/arm/mach-ux500/cpu-db5500.c @@ -13,7 +13,7 @@ #include <asm/mach/map.h> #include <asm/pmu.h> -#include <plat/gpio-nomadik.h> +#include <linux/gpio.h> #include <mach/hardware.h> #include <mach/devices.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 b1ac9277390..b008ff3abba 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/abx500/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) |