diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:33:05 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:33:05 -0400 |
| commit | c97f68145e8067b3ac4b126a6faebf90f9ffc302 (patch) | |
| tree | eb2060681552a00e9efa98224b95f69a3dc84390 /arch/arm/Kconfig | |
| parent | b1add0480a95b6ceaece5caf6c50614771eae9b2 (diff) | |
| parent | 7bff3c4ce44ea48f50dc47a5994454984bd08c59 (diff) | |
Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git
Merge branch 'davinci' into devel
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 960d5a54aec3..5f6e34925a32 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -524,6 +524,7 @@ config ARCH_DAVINCI | |||
| 524 | select GENERIC_TIME | 524 | select GENERIC_TIME |
| 525 | select GENERIC_CLOCKEVENTS | 525 | select GENERIC_CLOCKEVENTS |
| 526 | select GENERIC_GPIO | 526 | select GENERIC_GPIO |
| 527 | select ARCH_REQUIRE_GPIOLIB | ||
| 527 | select HAVE_CLK | 528 | select HAVE_CLK |
| 528 | select ZONE_DMA | 529 | select ZONE_DMA |
| 529 | help | 530 | help |