diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-01-05 13:05:51 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-01-05 13:05:51 -0500 |
| commit | fda87903f4e9caf87e02d52768c2611e417b7efb (patch) | |
| tree | bd2f84361699651cce5661bcfe60e3fe5ee91517 /drivers/gpio/Kconfig | |
| parent | 1a0703ede4493bd74f9c6b53f782b749e175a88e (diff) | |
| parent | 2de0dbc5f6830e7659083d1929f57cb88b16a3b6 (diff) | |
Merge branch 'gpio-for-grant' of git://sources.calxeda.com/kernel/linux into gpio/next
Conflicts:
drivers/gpio/gpio-pl061.c
Diffstat (limited to 'drivers/gpio/Kconfig')
| -rw-r--r-- | drivers/gpio/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 4e04157a3683..8a77b0a937a5 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig | |||
| @@ -138,6 +138,7 @@ config GPIO_MXS | |||
| 138 | config GPIO_PL061 | 138 | config GPIO_PL061 |
| 139 | bool "PrimeCell PL061 GPIO support" | 139 | bool "PrimeCell PL061 GPIO support" |
| 140 | depends on ARM_AMBA | 140 | depends on ARM_AMBA |
| 141 | select GENERIC_IRQ_CHIP | ||
| 141 | help | 142 | help |
| 142 | Say yes here to support the PrimeCell PL061 GPIO device | 143 | Say yes here to support the PrimeCell PL061 GPIO device |
| 143 | 144 | ||