aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c64xx/Kconfig
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2010-10-25 16:10:16 +0900
committerKukjin Kim <kgene.kim@samsung.com>2010-10-25 16:10:16 +0900
commit8e0e9e295814d3d514bdfdef72ca271ebe862433 (patch)
treeb27f779890bfcd19f91c3ea88a0e210ed77d15d4 /arch/arm/mach-s3c64xx/Kconfig
parent7684f784b08f0b1568567ff5f23cf0f5dff86be5 (diff)
parentfe894f97ad89951a7bdb150ad5645178b89fd6b7 (diff)
downloadkernel_samsung_smdk4412-8e0e9e295814d3d514bdfdef72ca271ebe862433.tar.gz
kernel_samsung_smdk4412-8e0e9e295814d3d514bdfdef72ca271ebe862433.tar.bz2
kernel_samsung_smdk4412-8e0e9e295814d3d514bdfdef72ca271ebe862433.zip
Merge branch 'next-s3c64xx' into for-next
Diffstat (limited to 'arch/arm/mach-s3c64xx/Kconfig')
-rw-r--r--arch/arm/mach-s3c64xx/Kconfig21
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 1e4d78af7d8..fe1fd3007ae 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -98,12 +98,33 @@ config MACH_ANW6410
help
Machine support for the A&W6410
+config MACH_MINI6410
+ bool "MINI6410"
+ select CPU_S3C6410
+ select S3C_DEV_HSMMC
+ select S3C_DEV_HSMMC1
+ select S3C64XX_SETUP_SDHCI
+ select S3C_DEV_USB_HOST
+ select S3C_DEV_NAND
+ select S3C_DEV_FB
+ select S3C64XX_SETUP_FB_24BPP
+ select SAMSUNG_DEV_ADC
+ select SAMSUNG_DEV_TS
+ help
+ Machine support for the FriendlyARM MINI6410
+
config MACH_REAL6410
bool "REAL6410"
select CPU_S3C6410
select S3C_DEV_HSMMC
select S3C_DEV_HSMMC1
select S3C64XX_SETUP_SDHCI
+ select S3C_DEV_FB
+ select S3C64XX_SETUP_FB_24BPP
+ select S3C_DEV_NAND
+ select SAMSUNG_DEV_ADC
+ select SAMSUNG_DEV_TS
+ select S3C_DEV_USB_HOST
help
Machine support for the CoreWind REAL6410