diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-16 18:35:06 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-16 18:35:06 -0400 |
| commit | 6bfc82ff589a00e5fbc12b958c649d703d273c86 (patch) | |
| tree | 9326c7213d5ccee556bff1831e8f88681a27e57c /arch/arm/mach-omap1/gpio15xx.c | |
| parent | 26638c667e645de368cd68cade716ed0faef6269 (diff) | |
| parent | 68cb700c59fae6cd539c9dc1e9f2584f671935a0 (diff) | |
Merge tag 'omap-cleanup-sparseirq-for-v3.7' into devel-dt
This branch contains changes needed to make omap2+
work properly with sparse IRQ. It also removes
dependencies to mach/hardware.h. These help moving
things towards ARM single zImage support.
This branch is based on a commit in tty-next
branch with omap-devel-gpmc-fixed-for-v3.7 and
cleanup-omap-tags-for-v3.7 merged in to keep things
compiling and sort out some merge conflicts.
Conflicts:
arch/arm/mach-omap2/omap4-common.c
drivers/gpio/gpio-twl4030.c
Diffstat (limited to 'arch/arm/mach-omap1/gpio15xx.c')
| -rw-r--r-- | arch/arm/mach-omap1/gpio15xx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/gpio15xx.c b/arch/arm/mach-omap1/gpio15xx.c index ebef15e5e7b7..98e6f39224a4 100644 --- a/arch/arm/mach-omap1/gpio15xx.c +++ b/arch/arm/mach-omap1/gpio15xx.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/gpio.h> | 19 | #include <linux/gpio.h> |
| 20 | #include <linux/platform_data/gpio-omap.h> | ||
| 20 | 21 | ||
| 21 | #define OMAP1_MPUIO_VBASE OMAP1_MPUIO_BASE | 22 | #define OMAP1_MPUIO_VBASE OMAP1_MPUIO_BASE |
| 22 | #define OMAP1510_GPIO_BASE 0xFFFCE000 | 23 | #define OMAP1510_GPIO_BASE 0xFFFCE000 |