ARM: SAMSUNG: merge plat-s5p into plat-samsung

Since just plat-samsung can support all of Samsung stuff so
that there is no more need to keep the plat-s5p for S5P SoCs.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

2 files changed, 0 insertions, 35 deletions

diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
deleted file mode 100644
index e7d5d77b1b64..000000000000
--- a/arch/arm/plat-s5p/Kconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-# arch/arm/plat-s5p/Kconfig
-#
-# Copyright (c) 2009 Samsung Electronics Co., Ltd.
-#               http://www.samsung.com/
-#
-# Licensed under GPLv2
-
-config PLAT_S5P
-        bool
-        depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS)
-        default y
-        select ARM_VIC if !ARCH_EXYNOS
-        select ARM_GIC if ARCH_EXYNOS
-        select GIC_NON_BANKED if ARCH_EXYNOS4
-        select NO_IOPORT
-        select ARCH_REQUIRE_GPIOLIB
-        select S3C_GPIO_TRACK
-        select S5P_GPIO_DRVSTR
-        select SAMSUNG_GPIOLIB_4BIT
-        select PLAT_SAMSUNG
-        select SAMSUNG_CLKSRC
-        select SAMSUNG_IRQ_VIC_TIMER
-        help
-          Base platform code for Samsung's S5P series SoC.
diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile
deleted file mode 100644
index 884b9a17360e..000000000000
--- a/arch/arm/plat-s5p/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# arch/arm/plat-s5p/Makefile
-#
-# Copyright (c) 2009 Samsung Electronics Co., Ltd.
-#               http://www.samsung.com/
-#
-# Licensed under GPLv2
-
-obj-y                           :=
-obj-m                           :=
-obj-n                           := dummy.o
-obj-                            :=