summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung
diff options
context:
space:
mode:
authorTomasz Figa <t.figa@samsung.com>2014-07-03 13:17:12 +0200
committerKukjin Kim <kgene.kim@samsung.com>2014-07-18 21:32:16 +0200
commitaa42587a43e82b409436e05ce52835904de1a96f (patch)
tree0617153bf08eb07042d3717a9445e59f18a3ae6e /arch/arm/plat-samsung
parentcpufreq: s5pv210: Make the driver multiplatform aware (diff)
downloadlinux-aa42587a43e82b409436e05ce52835904de1a96f.tar.xz
linux-aa42587a43e82b409436e05ce52835904de1a96f.zip
ARM: S5PV210: Enable multi-platform build support
This makes it possible to enable the s5pv210 platform as part of a multiplatform kernel. Also redundant Kconfig options are removed. Signed-off-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r--arch/arm/plat-samsung/Makefile1
-rw-r--r--arch/arm/plat-samsung/cpu.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index 906f54b11225..97fc15ecc4ae 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -5,7 +5,6 @@
# Licensed under GPLv2
ccflags-$(CONFIG_ARCH_MULTI_V7) += -I$(srctree)/$(src)/include
-ccflags-$(CONFIG_ARCH_EXYNOS) += -I$(srctree)/arch/arm/mach-exynos/include
obj-y :=
obj-m :=
diff --git a/arch/arm/plat-samsung/cpu.c b/arch/arm/plat-samsung/cpu.c
index 364963a0a344..945fc3f5b7a2 100644
--- a/arch/arm/plat-samsung/cpu.c
+++ b/arch/arm/plat-samsung/cpu.c
@@ -16,7 +16,7 @@
#include <linux/io.h>
-#include <mach/map.h>
+#include <plat/map-base.h>
#include <plat/cpu.h>
unsigned long samsung_cpu_id;