diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-11 13:55:24 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-11 13:56:18 +0400 |
| commit | 70384d3f12ae0981195a3d8d3e3f033887e6603c (patch) | |
| tree | ccd70a8734f60e4abd750d9748c4df6013dc9aa0 /include | |
| parent | 67028154bebd0fae7f9b2d77a5cf7bcf5e3c8ef0 (diff) | |
| parent | 0a43cd3b1cc1b7e1dfc461cf55b414610d038769 (diff) | |
| download | linux-70384d3f12ae0981195a3d8d3e3f033887e6603c.tar.xz | |
Merge branch 'armsoc/pxa' of git://github.com/hzhuang1/linux into next/boards
A series dealing with gpio configuration cleanup from Haojian Zhuang.
* 'armsoc/pxa' of git://github.com/hzhuang1/linux:
ARM: pxa: move debug uart code
ARM: pxa: select PXA935 on saar & tavorevb
ARM: mmp: add more compatible names in gpio driver
ARM: pxa: move PXA_GPIO_TO_IRQ macro
ARM: pxa: remove cpu_is_xxx in gpio driver
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/gpio-pxa.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/gpio-pxa.h b/include/linux/gpio-pxa.h index d755b28ba635..d90ebbe02ca4 100644 --- a/include/linux/gpio-pxa.h +++ b/include/linux/gpio-pxa.h @@ -14,6 +14,7 @@ extern int pxa_last_gpio; extern int pxa_irq_to_gpio(int irq); struct pxa_gpio_platform_data { + int irq_base; int (*gpio_set_wake)(unsigned int gpio, unsigned int on); }; |