diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 01:07:57 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 01:07:57 +0400 |
| commit | e7051e9dab77ddeaddbe12364939ae239d92ca73 (patch) | |
| tree | b1855cb663f64a374277df1a909cbac1ecf15fbf /arch/arm/plat-s5p/Kconfig | |
| parent | 38abdcd0d0689aaca94e740ac67a952c7918caef (diff) | |
| parent | 5da30bb6d902a36265e74f7141a904b19ec25bd4 (diff) | |
| download | linux-e7051e9dab77ddeaddbe12364939ae239d92ca73.tar.xz | |
Merge branch 'samsung/exynos5' into next/soc2
Diffstat (limited to 'arch/arm/plat-s5p/Kconfig')
| -rw-r--r-- | arch/arm/plat-s5p/Kconfig | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig index 8167ce66188c..88795ea2ecaa 100644 --- a/arch/arm/plat-s5p/Kconfig +++ b/arch/arm/plat-s5p/Kconfig @@ -9,8 +9,8 @@ config PLAT_S5P bool depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS) default y - select ARM_VIC if !ARCH_EXYNOS4 - select ARM_GIC if ARCH_EXYNOS4 + select ARM_VIC if !ARCH_EXYNOS + select ARM_GIC if ARCH_EXYNOS select GIC_NON_BANKED if ARCH_EXYNOS4 select NO_IOPORT select ARCH_REQUIRE_GPIOLIB @@ -40,6 +40,10 @@ config S5P_HRT help Use the High Resolution timer support +config S5P_DEV_UART + def_bool y + depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210) + config S5P_PM bool help |