projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
[cascardo/linux.git]
/
arch
/
arm
/
mach-w90x900
/
mach-nuc950evb.c
diff --git
a/arch/arm/mach-w90x900/mach-nuc950evb.c
b/arch/arm/mach-w90x900/mach-nuc950evb.c
index
500fe59
..
26f7189
100644
(file)
--- a/
arch/arm/mach-w90x900/mach-nuc950evb.c
+++ b/
arch/arm/mach-w90x900/mach-nuc950evb.c
@@
-40,6
+40,6
@@
MACHINE_START(W90P950EVB, "W90P950EVB")
.map_io = nuc950evb_map_io,
.init_irq = nuc900_init_irq,
.init_machine = nuc950evb_init,
- .
timer = &nuc900_timer
,
+ .
init_time = nuc900_timer_init
,
.restart = nuc9xx_restart,
MACHINE_END