projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion
[linux-2.6-block.git]
/
arch
/
arm
/
mach-kirkwood
/
d2net_v2-setup.c
diff --git
a/arch/arm/mach-kirkwood/d2net_v2-setup.c
b/arch/arm/mach-kirkwood/d2net_v2-setup.c
index 4aa86e4a152c22bc2707463b85d1f3d98240a509..a31c9499ab36c6a0f235e39cf22e4bd7f522d14c 100644
(file)
--- a/
arch/arm/mach-kirkwood/d2net_v2-setup.c
+++ b/
arch/arm/mach-kirkwood/d2net_v2-setup.c
@@
-225,5
+225,5
@@
MACHINE_START(D2NET_V2, "LaCie d2 Network v2")
.init_machine = d2net_v2_init,
.map_io = kirkwood_map_io,
.init_irq = kirkwood_init_irq,
- .timer = &
lacie_v2
_timer,
+ .timer = &
kirkwood
_timer,
MACHINE_END