git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-ux500
/
timer.c
diff --git
a/arch/arm/mach-ux500/timer.c
b/arch/arm/mach-ux500/timer.c
index
bd8e110
..
741e71f
100644
(file)
--- a/
arch/arm/mach-ux500/timer.c
+++ b/
arch/arm/mach-ux500/timer.c
@@
-54,7
+54,7
@@
static void __init ux500_timer_init(void)
void __iomem *tmp_base;
struct device_node *np;
- if (cpu_is_u8500()) {
+ if (cpu_is_u8500
_family
()) {
mtu_timer_base = __io_address(U8500_MTU0_BASE);
prcmu_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE);
} else {