diff options
author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-04-21 08:15:06 -0500 |
---|---|---|
committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-04-21 08:15:06 -0500 |
commit | 7f54cddfc767c29bc030a9f512c1d5e8e33f337d (patch) | |
tree | e69a57ebce834150e4d28b230eea93ecbb6895de /arch/arm/mach-exynos/Kconfig | |
parent | 93d431e2909e0ec03127b861f4865cde89d84520 (diff) | |
parent | 494db70db363f41da78ee5f07096cf04068d7a3e (diff) |
Merge branch 'linux-linaro-lng-v3.18' into linux-linaro-lng-v3.18-rtlinux-lng-preempt-rt-3.18.11-2015.05linux-lng-preempt-rt-3.18.11-2015.04
Conflicts:
include/linux/interrupt.h
kernel/irq/manage.c
Diffstat (limited to 'arch/arm/mach-exynos/Kconfig')
-rw-r--r-- | arch/arm/mach-exynos/Kconfig | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 2d0240f241b8..03fb517b11ba 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -33,7 +33,7 @@ config ARCH_EXYNOS3 bool "SAMSUNG EXYNOS3" select ARM_CPU_SUSPEND if PM help - Samsung EXYNOS3 (Crotex-A7) SoC based systems + Samsung EXYNOS3 (Cortex-A7) SoC based systems config ARCH_EXYNOS4 bool "SAMSUNG EXYNOS4" @@ -43,6 +43,8 @@ config ARCH_EXYNOS4 select CPU_EXYNOS4210 select GIC_NON_BANKED select KEYBOARD_SAMSUNG if INPUT_KEYBOARD + select HAVE_ARM_SCU if SMP + select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 help Samsung EXYNOS4 (Cortex-A9) SoC based systems @@ -50,6 +52,10 @@ config ARCH_EXYNOS4 config ARCH_EXYNOS5 bool "SAMSUNG EXYNOS5" default y + select ARCH_SUPPORTS_BIG_ENDIAN + select CLKSRC_OF + select HAVE_SMP + select USB_ARCH_HAS_XHCI help Samsung EXYNOS5 (Cortex-A15/A7) SoC based systems @@ -94,6 +100,8 @@ config SOC_EXYNOS5420 bool "SAMSUNG EXYNOS5420" default y depends on ARCH_EXYNOS5 + select S5P_PM if PM + select S5P_SLEEP if PM config SOC_EXYNOS5440 bool "SAMSUNG EXYNOS5440" |