diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-27 07:39:14 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-27 07:39:14 -0500 |
| commit | e902be56cbf2a48d96d11d6884767e638d41c712 (patch) | |
| tree | e4d79479a1280ad4841005680e37119d6694c3bf /arch/arm/Kconfig | |
| parent | c750815e2d436f4379c7af8a8770ef2ae71c5607 (diff) | |
| parent | 5e1dbdb458ada37f7e97265cb2ea87c55fd5d034 (diff) | |
Merge branches 'core' and 'clks' into devel
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 60a09fcc4af8..a04199771730 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -211,6 +211,7 @@ config ARCH_INTEGRATOR | |||
| 211 | bool "ARM Ltd. Integrator family" | 211 | bool "ARM Ltd. Integrator family" |
| 212 | select ARM_AMBA | 212 | select ARM_AMBA |
| 213 | select HAVE_CLK | 213 | select HAVE_CLK |
| 214 | select COMMON_CLKDEV | ||
| 214 | select ICST525 | 215 | select ICST525 |
| 215 | help | 216 | help |
| 216 | Support for ARM's Integrator platform. | 217 | Support for ARM's Integrator platform. |
| @@ -219,6 +220,7 @@ config ARCH_REALVIEW | |||
| 219 | bool "ARM Ltd. RealView family" | 220 | bool "ARM Ltd. RealView family" |
| 220 | select ARM_AMBA | 221 | select ARM_AMBA |
| 221 | select HAVE_CLK | 222 | select HAVE_CLK |
| 223 | select COMMON_CLKDEV | ||
| 222 | select ICST307 | 224 | select ICST307 |
| 223 | select GENERIC_TIME | 225 | select GENERIC_TIME |
| 224 | select GENERIC_CLOCKEVENTS | 226 | select GENERIC_CLOCKEVENTS |
| @@ -230,6 +232,7 @@ config ARCH_VERSATILE | |||
| 230 | select ARM_AMBA | 232 | select ARM_AMBA |
| 231 | select ARM_VIC | 233 | select ARM_VIC |
| 232 | select HAVE_CLK | 234 | select HAVE_CLK |
| 235 | select COMMON_CLKDEV | ||
| 233 | select ICST307 | 236 | select ICST307 |
| 234 | select GENERIC_TIME | 237 | select GENERIC_TIME |
| 235 | select GENERIC_CLOCKEVENTS | 238 | select GENERIC_CLOCKEVENTS |
| @@ -477,6 +480,7 @@ config ARCH_PXA | |||
| 477 | select ARCH_MTD_XIP | 480 | select ARCH_MTD_XIP |
| 478 | select GENERIC_GPIO | 481 | select GENERIC_GPIO |
| 479 | select HAVE_CLK | 482 | select HAVE_CLK |
| 483 | select COMMON_CLKDEV | ||
| 480 | select ARCH_REQUIRE_GPIOLIB | 484 | select ARCH_REQUIRE_GPIOLIB |
| 481 | select GENERIC_TIME | 485 | select GENERIC_TIME |
| 482 | select GENERIC_CLOCKEVENTS | 486 | select GENERIC_CLOCKEVENTS |