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 branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx5
/
clock-mx51-mx53.c
diff --git
a/arch/arm/mach-mx5/clock-mx51-mx53.c
b/arch/arm/mach-mx5/clock-mx51-mx53.c
index
5955ca3
..
c2dafe4
100644
(file)
--- a/
arch/arm/mach-mx5/clock-mx51-mx53.c
+++ b/
arch/arm/mach-mx5/clock-mx51-mx53.c
@@
-1593,7
+1593,7
@@
int __init mx51_clocks_init(unsigned long ckil, unsigned long osc,
/* System timer */
mxc_timer_init(&gpt_clk, MX51_IO_ADDRESS(MX51_GPT1_BASE_ADDR),
- MX51_
MXC_
INT_GPT);
+ MX51_INT_GPT);
return 0;
}