diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-21 00:16:43 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-21 00:16:43 -0400 |
| commit | ea832c41dacbc4a5f3888d9ef7c38213914aba2a (patch) | |
| tree | bee97817d9a55f000e2bec5fa5d62d325050e6a6 /arch/arm/Kconfig | |
| parent | b74aae9a2074e1caa2e40bf119f3a633f77c94e4 (diff) | |
| parent | 84bae6c379e362aa017efd417199f51d5c2273ac (diff) | |
Merge branch 'next/dt' into next/multiplatform
* next/dt: (182 commits)
ARM: tegra: Add Avionic Design Tamonten Evaluation Carrier support
ARM: tegra: Add Avionic Design Medcom-Wide support
ARM: tegra: Add Avionic Design Plutux support
ARM: tegra: Add Avionic Design Tamonten support
ARM: tegra: dts: Add pwm label
ARM: dt: tegra: whistler: configure power off
ARM: mxs: m28evk: Disable OCOTP OUI loading
ARM: imx6q: use pll2_pfd2_396m as the enfc_sel's parent
ARM: dts: imx6q-sabrelite: add usbotg pinctrl support
ARM: dts: imx23-olinuxino: Add USB host support
ARM: dts: imx6q-sabrelite: add usbmisc device
ARM: dts: mx23: Add USB resources
ARM: dts: mxs: Add ethernetX to macX aliases
ARM: msm: Remove non-DT targets from 8960
ARM: msm: Add DT support for 8960
ARM: msm: Move io mapping prototypes to common.h
ARM: msm: Rename board-msm8x60 to signify its DT only status
ARM: msm: Make 8660 a DT only target
ARM: msm: Move 8660 to DT timer
ARM: msm: Add DT support to msm_timer
...
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6d4d43858483..896824bb860a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -273,7 +273,7 @@ config ARCH_INTEGRATOR | |||
| 273 | select ARM_AMBA | 273 | select ARM_AMBA |
| 274 | select ARCH_HAS_CPUFREQ | 274 | select ARCH_HAS_CPUFREQ |
| 275 | select COMMON_CLK | 275 | select COMMON_CLK |
| 276 | select CLK_VERSATILE | 276 | select COMMON_CLK_VERSATILE |
| 277 | select HAVE_TCM | 277 | select HAVE_TCM |
| 278 | select ICST | 278 | select ICST |
| 279 | select GENERIC_CLOCKEVENTS | 279 | select GENERIC_CLOCKEVENTS |
| @@ -288,13 +288,12 @@ config ARCH_INTEGRATOR | |||
| 288 | config ARCH_REALVIEW | 288 | config ARCH_REALVIEW |
| 289 | bool "ARM Ltd. RealView family" | 289 | bool "ARM Ltd. RealView family" |
| 290 | select ARM_AMBA | 290 | select ARM_AMBA |
| 291 | select CLKDEV_LOOKUP | 291 | select COMMON_CLK |
| 292 | select HAVE_MACH_CLKDEV | 292 | select COMMON_CLK_VERSATILE |
| 293 | select ICST | 293 | select ICST |
| 294 | select GENERIC_CLOCKEVENTS | 294 | select GENERIC_CLOCKEVENTS |
| 295 | select ARCH_WANT_OPTIONAL_GPIOLIB | 295 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 296 | select PLAT_VERSATILE | 296 | select PLAT_VERSATILE |
| 297 | select PLAT_VERSATILE_CLOCK | ||
| 298 | select PLAT_VERSATILE_CLCD | 297 | select PLAT_VERSATILE_CLCD |
| 299 | select ARM_TIMER_SP804 | 298 | select ARM_TIMER_SP804 |
| 300 | select GPIO_PL061 if GPIOLIB | 299 | select GPIO_PL061 if GPIOLIB |