diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 14:34:05 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 16:50:56 +0200 |
| commit | 0dc488e778069b208d09516c5f0793dc37023c8e (patch) | |
| tree | 704ad7fa4d8202f1933297e4dd348128a2b9f702 /arch/arm/Kconfig | |
| parent | c4c54da24b8ae12abb2034edaf08021894caf0d0 (diff) | |
| parent | bd51de53e1be9896d815bbea30560262216d4616 (diff) | |
Merge branch 'samsung/exynos-multiplatform' into next/drivers
Merging this into the next/drivers branch avoids a number of
pointless conflicts with code changed here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ccb6c0c7152..f59b687dc32 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -860,19 +860,11 @@ config ARCH_S5PV210 help Samsung S5PV210/S5PC110 series based systems -config ARCH_EXYNOS +config ARCH_EXYNOS_SINGLE 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 |