diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-26 11:35:59 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-26 11:35:59 -0700 |
| commit | 772ba2ffd2033ecc4451c10b20c01814156ee1b1 (patch) | |
| tree | c3d7b3f1441bd900e3c8e22e1c37eed954c2fd41 /arch/arm/Kconfig | |
| parent | f19814721e24cac152348872ff38f38a3b45852a (diff) | |
| parent | 4923ee444a39c8b75027ed01a7812e940194dbec (diff) | |
| download | linux-772ba2ffd2033ecc4451c10b20c01814156ee1b1.tar.bz2 | |
Merge branch 'samsung/exynos-multiplatform' into next/multiplatform
This just merges in the revert of multiplatform support. Not doing it by
cherry-pick since we need the same revert in the next/drivers branch.
* samsung/exynos-multiplatform:
Revert "ARM: exynos: enable multiplatform support"
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 21a48d1bde43..88b662d4618d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -776,11 +776,18 @@ config ARCH_S5PV210 help Samsung S5PV210/S5PC110 series based systems -config ARCH_EXYNOS_SINGLE +config ARCH_EXYNOS bool "Samsung EXYNOS" + select ARCH_HAS_CPUFREQ select ARCH_HAS_HOLES_MEMORYMODEL select ARCH_SPARSEMEM_ENABLE + select CLKDEV_LOOKUP + select CPU_V7 + select GENERIC_CLOCKEVENTS + select HAVE_CLK + select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C_RTC if RTC_CLASS select NEED_MACH_GPIO_H select NEED_MACH_MEMORY_H help |