diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
| commit | f315ccb3e679f271583f2a4f463ad9b65665b751 (patch) | |
| tree | 44eb52102587d7b0bb592464cef6ec04bcac8b90 /arch/arm/Kconfig | |
| parent | ead03e30b050d6dda769e7e9b071c5fa720bf8d2 (diff) | |
| parent | 551e4fb2465b87de9d4aa1669b27d624435443bb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 64d19eff3faa..e19e7744e366 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -385,6 +385,7 @@ config ARCH_PXA | |||
| 385 | depends on MMU | 385 | depends on MMU |
| 386 | select ARCH_MTD_XIP | 386 | select ARCH_MTD_XIP |
| 387 | select GENERIC_GPIO | 387 | select GENERIC_GPIO |
| 388 | select HAVE_GPIO_LIB | ||
| 388 | select GENERIC_TIME | 389 | select GENERIC_TIME |
| 389 | select GENERIC_CLOCKEVENTS | 390 | select GENERIC_CLOCKEVENTS |
| 390 | select TICK_ONESHOT | 391 | select TICK_ONESHOT |
| @@ -1122,6 +1123,8 @@ source "drivers/i2c/Kconfig" | |||
| 1122 | 1123 | ||
| 1123 | source "drivers/spi/Kconfig" | 1124 | source "drivers/spi/Kconfig" |
| 1124 | 1125 | ||
| 1126 | source "drivers/gpio/Kconfig" | ||
| 1127 | |||
| 1125 | source "drivers/w1/Kconfig" | 1128 | source "drivers/w1/Kconfig" |
| 1126 | 1129 | ||
| 1127 | source "drivers/power/Kconfig" | 1130 | source "drivers/power/Kconfig" |