diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-05-16 07:29:50 (GMT) |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-05-16 07:29:50 (GMT) |
commit | bd6356bdafc853201168f718f0059fbe11191461 (patch) | |
tree | e2f82e8950b0201ab93c8fa8ff07ac31ba1c2a35 /arch/arm/plat-s5p/Kconfig | |
parent | 3185847957d4834d1b30b253b1c71bb05bad7265 (diff) | |
parent | 4b42120df72aeebd3967c952804cb1af53b91cc5 (diff) | |
download | linux-fsl-qoriq-bd6356bdafc853201168f718f0059fbe11191461.tar.xz |
Merge branch 'dev/removing-s5p6442' into for-next
Diffstat (limited to 'arch/arm/plat-s5p/Kconfig')
-rw-r--r-- | arch/arm/plat-s5p/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig index 8492297..5878bd9 100644 --- a/arch/arm/plat-s5p/Kconfig +++ b/arch/arm/plat-s5p/Kconfig @@ -7,7 +7,7 @@ config PLAT_S5P bool - depends on (ARCH_S5P64X0 || ARCH_S5P6442 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS4) + depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS4) default y select ARM_VIC if !ARCH_EXYNOS4 select ARM_GIC if ARCH_EXYNOS4 |