diff options
| author | Olof Johansson <olof@lixom.net> | 2012-12-12 19:10:45 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-12-12 19:10:45 -0500 |
| commit | 9c7466b217af784280d9fc841bbd559ef3bf33e9 (patch) | |
| tree | c21ee243e48912201b4041fbf3f9bd9165603bd8 /arch/arm/mach-omap1/gpio15xx.c | |
| parent | 4a76411ea3f1da9032e031f8fff8894b97d141b2 (diff) | |
| parent | 48d224d1efec98b0b78e511150b4f5752beceb7c (diff) | |
ARM: arm-soc: Merge branch 'next/pm2' into next/pm
Another smaller branch merged into next/pm before pull request.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap1/gpio15xx.c')
| -rw-r--r-- | arch/arm/mach-omap1/gpio15xx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/gpio15xx.c b/arch/arm/mach-omap1/gpio15xx.c index 98e6f39224a4..02b3eb2e201c 100644 --- a/arch/arm/mach-omap1/gpio15xx.c +++ b/arch/arm/mach-omap1/gpio15xx.c | |||
| @@ -19,6 +19,8 @@ | |||
| 19 | #include <linux/gpio.h> | 19 | #include <linux/gpio.h> |
| 20 | #include <linux/platform_data/gpio-omap.h> | 20 | #include <linux/platform_data/gpio-omap.h> |
| 21 | 21 | ||
| 22 | #include <mach/irqs.h> | ||
| 23 | |||
| 22 | #define OMAP1_MPUIO_VBASE OMAP1_MPUIO_BASE | 24 | #define OMAP1_MPUIO_VBASE OMAP1_MPUIO_BASE |
| 23 | #define OMAP1510_GPIO_BASE 0xFFFCE000 | 25 | #define OMAP1510_GPIO_BASE 0xFFFCE000 |
| 24 | 26 | ||