diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-20 03:04:59 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-20 03:04:59 +0900 |
| commit | 2de05a57467c43f58802cdeaa547aee73396b6f3 (patch) | |
| tree | e73f96c9954479a6909eb6195631284eac0fa47f /arch/arm/Kconfig | |
| parent | ab5a4e6381d27a6554e6833383e536773e3a6ec1 (diff) | |
| parent | 380c3a545f7de096c0f84344ba70ea4cfd1a059f (diff) | |
| download | op-kernel-dev-2de05a57467c43f58802cdeaa547aee73396b6f3.zip op-kernel-dev-2de05a57467c43f58802cdeaa547aee73396b6f3.tar.gz | |
Merge branch 'next/devel-exynos5250-1' into next/devel-samsung-2
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 36586dba..85d8e2e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1088,7 +1088,6 @@ source "arch/arm/mach-sa1100/Kconfig" source "arch/arm/plat-samsung/Kconfig" source "arch/arm/plat-s3c24xx/Kconfig" -source "arch/arm/plat-s5p/Kconfig" source "arch/arm/plat-spear/Kconfig" |
