summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2010-05-03 09:42:07 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-04 18:50:06 +0200
commitcb165c52561fd5947747fdbdb0c7ad22c6138175 (patch)
treec92b622fef4aff2de35ed39229edbcfb7bab556c /arch
parentARM: 6088/1: ux500: use UX500_* macros instead of U8500_* (diff)
downloadlinux-cb165c52561fd5947747fdbdb0c7ad22c6138175.tar.xz
linux-cb165c52561fd5947747fdbdb0c7ad22c6138175.zip
ARM: 6089/1: ux500: rename cpu-u8500.c to cpu-db8500.c
Move the DB8500-specific file to a more appropriate name. Acked-by: Linus Walleij <linus.walleij@stericsson.com> Acked-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ux500/Makefile2
-rw-r--r--arch/arm/mach-ux500/cpu-db8500.c (renamed from arch/arm/mach-ux500/cpu-u8500.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index 55651e04ab43..2eb768583e21 100644
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -3,6 +3,6 @@
#
obj-y := clock.o cpu.o devices.o
-obj-$(CONFIG_ARCH_U8500) += cpu-u8500.o devices-db8500.o
+obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o devices-db8500.o
obj-$(CONFIG_MACH_U8500_MOP) += board-mop500.o
obj-$(CONFIG_SMP) += platsmp.o headsmp.o localtimer.o
diff --git a/arch/arm/mach-ux500/cpu-u8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index d04299f3b6b5..d04299f3b6b5 100644
--- a/arch/arm/mach-ux500/cpu-u8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c