projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next/soc' into HEAD
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
mach-ux500
/
cpu-db8500.c
diff --git
a/arch/arm/mach-ux500/cpu-db8500.c
b/arch/arm/mach-ux500/cpu-db8500.c
index
7e6c384
..
3ce7d94
100644
(file)
--- a/
arch/arm/mach-ux500/cpu-db8500.c
+++ b/
arch/arm/mach-ux500/cpu-db8500.c
@@
-80,7
+80,7
@@
void __init u8500_map_io(void)
iotable_init(u8500_common_io_desc, ARRAY_SIZE(u8500_common_io_desc));
- if (cpu_is_u
9540
())
+ if (cpu_is_u
x540_family
())
iotable_init(u9540_io_desc, ARRAY_SIZE(u9540_io_desc));
else
iotable_init(u8500_io_desc, ARRAY_SIZE(u8500_io_desc));