diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-08-04 07:43:45 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-08-04 07:43:45 -0400 |
| commit | 7590d1defdc720a97a9e186f45f529c4ae1b40f7 (patch) | |
| tree | e7ffdc043a2847f410d654d8e99e001f3138937a /arch/arm/plat-mxc/include/mach/gpio.h | |
| parent | 7e788b4289bb025a96e327c604cb2db92e17108f (diff) | |
| parent | 869fef41547db95df8523bf67845a21313709428 (diff) | |
Merge branch 'devel-map-io' into omap-for-linus
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/gpio.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/gpio.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/gpio.h b/arch/arm/plat-mxc/include/mach/gpio.h index 894d2f87c856..661fbc605759 100644 --- a/arch/arm/plat-mxc/include/mach/gpio.h +++ b/arch/arm/plat-mxc/include/mach/gpio.h | |||
| @@ -33,9 +33,11 @@ | |||
| 33 | struct mxc_gpio_port { | 33 | struct mxc_gpio_port { |
| 34 | void __iomem *base; | 34 | void __iomem *base; |
| 35 | int irq; | 35 | int irq; |
| 36 | int irq_high; | ||
| 36 | int virtual_irq_start; | 37 | int virtual_irq_start; |
| 37 | struct gpio_chip chip; | 38 | struct gpio_chip chip; |
| 38 | u32 both_edges; | 39 | u32 both_edges; |
| 40 | spinlock_t lock; | ||
| 39 | }; | 41 | }; |
| 40 | 42 | ||
| 41 | int mxc_gpio_init(struct mxc_gpio_port*, int); | 43 | int mxc_gpio_init(struct mxc_gpio_port*, int); |