diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-26 22:47:45 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-26 22:47:45 +0400 |
| commit | 340fcb5cb4c91e58a5102beb0b86b9c416b8c956 (patch) | |
| tree | d0e41752e473069f4ec9a065cd1f060c4e91266b /arch/arm/Kconfig | |
| parent | 37746c9a2dd28d52790dd84267b848c087a63b2e (diff) | |
| parent | 4923ee444a39c8b75027ed01a7812e940194dbec (diff) | |
| download | linux-340fcb5cb4c91e58a5102beb0b86b9c416b8c956.tar.xz | |
Merge branch 'samsung/exynos-multiplatform' into next/drivers
This merges in the revert of multiplatform support for exynos.
Trivial conflicts on removed code. Also, needed to add "select COMMON_CLK"
to the non-multiplatform EXYNOS config option.
* 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 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f59b687dc325..ccb6c0c71521 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -860,11 +860,19 @@ 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 COMMON_CLK + 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 |