diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-15 23:45:22 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-15 23:45:22 +0100 |
| commit | fb4f0424293a0fb75d0c9edbc16bd618930ff2da (patch) | |
| tree | 65a27a478b52ac1208ff135009ea809c0dc5acdb /arch/arm/Kconfig | |
| parent | Merge branch 'multiplatform/debug-ll' into next/multiplatform (diff) | |
| parent | ARM: s3c64xx: allow building without board support (diff) | |
| download | linux-fb4f0424293a0fb75d0c9edbc16bd618930ff2da.tar.xz linux-fb4f0424293a0fb75d0c9edbc16bd618930ff2da.zip | |
Merge branch 's3c64xx/multiplatform' into next/multiplatform
* s3c64xx/multiplatform:
ARM: s3c64xx: allow building without board support
ARM: s3c64xx: multiplatform support
ARM: s3c64xx: use common debug-ll implementation
ARM: s3c64xx: use new adc/touchscreen driver
iio: exynos-adc: add experimental touchscreen support
ARM: s3c64xx: enable sparse IRQ support
ARM: s3c64xx: prepare initcalls for multiplatform
gpio: samsung: move gpio-samsung driver back to platform code
ASoC: samsung/smartq: use dynamic registration
Input: s3c2410_ts: fix S3C_ADC dependency
Conflicts:
arch/arm/Kconfig.debug
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 34e1569a11ee..97adb5eda7bb 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -682,32 +682,6 @@ config ARCH_S3C24XX (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or the Samsung SMDK2410 development board (and derivatives). -config ARCH_S3C64XX - bool "Samsung S3C64XX" - select ARCH_REQUIRE_GPIOLIB - select ARM_AMBA - select ARM_VIC - select ATAGS - select CLKDEV_LOOKUP - select CLKSRC_SAMSUNG_PWM - select COMMON_CLK_SAMSUNG - select CPU_V6K - select GENERIC_CLOCKEVENTS - select GPIO_SAMSUNG - select HAVE_S3C2410_I2C if I2C - select HAVE_S3C2410_WATCHDOG if WATCHDOG - select HAVE_TCM - select NO_IOPORT_MAP - select PLAT_SAMSUNG - select PM_GENERIC_DOMAINS if PM - select S3C_DEV_NAND - select S3C_GPIO_TRACK - select SAMSUNG_ATAGS - select SAMSUNG_WAKEMASK - select SAMSUNG_WDT_RESET - help - Samsung S3C64XX series based systems - config ARCH_DAVINCI bool "TI DaVinci" select ARCH_HAS_HOLES_MEMORYMODEL |