diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-07 15:03:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-07 15:03:42 +0200 |
| commit | 436281c9a110ff16c1fb396add5dd944ee92cf36 (patch) | |
| tree | afda86db9e89d41ca49a8311673b994a82d16d42 /arch/arm/mach-exynos/Kconfig | |
| parent | 4cbb62148cd686c2d3618861deb15eeb83744405 (diff) | |
| parent | febb72a6e4cc6c8cffcc1ea649a3fb364f1ea432 (diff) | |
| download | linux-436281c9a110ff16c1fb396add5dd944ee92cf36.tar.gz linux-436281c9a110ff16c1fb396add5dd944ee92cf36.tar.bz2 linux-436281c9a110ff16c1fb396add5dd944ee92cf36.zip | |
Merge branch 'linus' into sched/core
Merge reason: We were on a pretty old base, refresh before moving on.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-exynos/Kconfig')
| -rw-r--r-- | arch/arm/mach-exynos/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 0491ceef1cda..e81c35f936b5 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -368,6 +368,7 @@ comment "Flattened Device Tree based board for EXYNOS SoCs" config MACH_EXYNOS4_DT bool "Samsung Exynos4 Machine using device tree" + depends on ARCH_EXYNOS4 select CPU_EXYNOS4210 select USE_OF select ARM_AMBA @@ -380,6 +381,7 @@ config MACH_EXYNOS4_DT config MACH_EXYNOS5_DT bool "SAMSUNG EXYNOS5 Machine using device tree" + depends on ARCH_EXYNOS5 select SOC_EXYNOS5250 select USE_OF select ARM_AMBA |