diff options
| author |   Tony Lindgren <tony@atomide.com> | 2012-03-29 10:16:04 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-03-29 10:16:04 -0700 |
| commit | 2533c2cfbff8f0ee53b8448d6362b54c272125aa (patch) | |
| tree | e254f804f2da2f79e66ea71a1e534574ae9da2ac /arch/arm/plat-omap/include/plat/gpio.h | |
| parent | Merge branch 'fix-dss-mux' into fixes (diff) | |
| parent | ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition (diff) | |
| download | linux-dev-2533c2cfbff8f0ee53b8448d6362b54c272125aa.tar.xz linux-dev-2533c2cfbff8f0ee53b8448d6362b54c272125aa.zip | |
Merge branch 'fixes-gpio-to-irq' into fixes
Conflicts:
arch/arm/mach-omap1/board-htcherald.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/plat-omap/include/plat/gpio.h
drivers/input/serio/ams_delta_serio.c
Diffstat (limited to 'arch/arm/plat-omap/include/plat/gpio.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/gpio.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/include/plat/gpio.h b/arch/arm/plat-omap/include/plat/gpio.h index b8a96c6a1a30..2f6e9924a814 100644 --- a/arch/arm/plat-omap/include/plat/gpio.h +++ b/arch/arm/plat-omap/include/plat/gpio.h @@ -158,10 +158,6 @@ #define OMAP_MPUIO(nr) (OMAP_MAX_GPIO_LINES + (nr)) #define OMAP_GPIO_IS_MPUIO(nr) ((nr) >= OMAP_MAX_GPIO_LINES) -#define OMAP_GPIO_IRQ(nr) (OMAP_GPIO_IS_MPUIO(nr) ? \ - IH_MPUIO_BASE + ((nr) & 0x0f) : \ - IH_GPIO_BASE + (nr)) - struct omap_gpio_dev_attr { int bank_width; /* GPIO bank width */ bool dbck_flag; /* dbck required or not - True for OMAP3&4 */ |