diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-16 17:13:09 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-16 17:13:09 +0900 |
| commit | 2520123382e97271e932377c83bca010c265be55 (patch) | |
| tree | 1403c6c4ea400be832322cd84acee93cd49076e7 /arch/arm/mach-exynos4/Kconfig | |
| parent | be4ab3616839c26caf914449de3a22458f53f6e5 (diff) | |
| parent | 699efdd2d34c535f415516e06d3d9f0bed131664 (diff) | |
| download | op-kernel-dev-2520123382e97271e932377c83bca010c265be55.zip op-kernel-dev-2520123382e97271e932377c83bca010c265be55.tar.gz | |
Merge branch 'next-samsung-board-v3.1' into next-samsung-board
Conflicts:
arch/arm/mach-exynos4/Kconfig
Diffstat (limited to 'arch/arm/mach-exynos4/Kconfig')
| -rw-r--r-- | arch/arm/mach-exynos4/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index f4ec583..c595bb0 100644 --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig @@ -210,6 +210,16 @@ config MACH_NURI help Machine support for Samsung Mobile NURI Board. +config MACH_ORIGEN + bool "ORIGEN" + select CPU_EXYNOS4210 + select S3C_DEV_RTC + select S3C_DEV_WDT + select S3C_DEV_HSMMC2 + select EXYNOS4_SETUP_SDHCI + help + Machine support for ORIGEN based on Samsung EXYNOS4210 + comment "EXYNOS4212 Boards" config MACH_SMDK4212 |
