diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 12:54:15 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 12:54:15 -0500 |
commit | 7266d48fca8ee2a15d15222c41f887e10db54c5a (patch) | |
tree | 775404bcbf8ce146ccaba905e841a3621ae7ce80 /arch/arm/mach-kirkwood | |
parent | 168268a225d24da3768a88c1029fb3014b0837ca (diff) | |
parent | 90cf214d6a549bf482e3c5751ee256cc885b96ea (diff) |
Merge branch 'timer/cleanup' into late/mvebu2
Basing the mvebu patches on top of the timer cleanup
avoids some nasty merges.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-kirkwood')
-rw-r--r-- | arch/arm/mach-kirkwood/board-dt.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/common.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/common.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/dockstar-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/guruplug-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/netspace_v2-setup.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/netxbig_v2-setup.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/openrd-setup.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/sheevaplug-setup.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/t5325-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/ts219-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/ts41x-setup.c | 2 |
17 files changed, 23 insertions, 27 deletions
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c index f964cdc44b1a..95cc04d14b65 100644 --- a/arch/arm/mach-kirkwood/board-dt.c +++ b/arch/arm/mach-kirkwood/board-dt.c | |||
@@ -185,7 +185,7 @@ DT_MACHINE_START(KIRKWOOD_DT, "Marvell Kirkwood (Flattened Device Tree)") | |||
185 | .map_io = kirkwood_map_io, | 185 | .map_io = kirkwood_map_io, |
186 | .init_early = kirkwood_init_early, | 186 | .init_early = kirkwood_init_early, |
187 | .init_irq = orion_dt_init_irq, | 187 | .init_irq = orion_dt_init_irq, |
188 | .timer = &kirkwood_timer, | 188 | .init_time = kirkwood_timer_init, |
189 | .init_machine = kirkwood_dt_init, | 189 | .init_machine = kirkwood_dt_init, |
190 | .restart = kirkwood_restart, | 190 | .restart = kirkwood_restart, |
191 | .dt_compat = kirkwood_dt_board_compat, | 191 | .dt_compat = kirkwood_dt_board_compat, |
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 5ed1f2e8c5f8..49792a0cd2d3 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c | |||
@@ -552,7 +552,7 @@ static int __init kirkwood_find_tclk(void) | |||
552 | return 166666667; | 552 | return 166666667; |
553 | } | 553 | } |
554 | 554 | ||
555 | static void __init kirkwood_timer_init(void) | 555 | void __init kirkwood_timer_init(void) |
556 | { | 556 | { |
557 | kirkwood_tclk = kirkwood_find_tclk(); | 557 | kirkwood_tclk = kirkwood_find_tclk(); |
558 | 558 | ||
@@ -560,10 +560,6 @@ static void __init kirkwood_timer_init(void) | |||
560 | IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk); | 560 | IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk); |
561 | } | 561 | } |
562 | 562 | ||
563 | struct sys_timer kirkwood_timer = { | ||
564 | .init = kirkwood_timer_init, | ||
565 | }; | ||
566 | |||
567 | /***************************************************************************** | 563 | /***************************************************************************** |
568 | * Audio | 564 | * Audio |
569 | ****************************************************************************/ | 565 | ****************************************************************************/ |
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h index 320aa61ff505..e956d0277dd1 100644 --- a/arch/arm/mach-kirkwood/common.h +++ b/arch/arm/mach-kirkwood/common.h | |||
@@ -157,7 +157,7 @@ void kirkwood_xor1_init(void); | |||
157 | void kirkwood_crypto_init(void); | 157 | void kirkwood_crypto_init(void); |
158 | 158 | ||
159 | extern int kirkwood_tclk; | 159 | extern int kirkwood_tclk; |
160 | extern struct sys_timer kirkwood_timer; | 160 | extern void kirkwood_timer_init(void); |
161 | 161 | ||
162 | #define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) | 162 | #define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) |
163 | 163 | ||
diff --git a/arch/arm/mach-kirkwood/d2net_v2-setup.c b/arch/arm/mach-kirkwood/d2net_v2-setup.c index 2c1a453df201..453418063c1e 100644 --- a/arch/arm/mach-kirkwood/d2net_v2-setup.c +++ b/arch/arm/mach-kirkwood/d2net_v2-setup.c | |||
@@ -226,6 +226,6 @@ MACHINE_START(D2NET_V2, "LaCie d2 Network v2") | |||
226 | .map_io = kirkwood_map_io, | 226 | .map_io = kirkwood_map_io, |
227 | .init_early = kirkwood_init_early, | 227 | .init_early = kirkwood_init_early, |
228 | .init_irq = kirkwood_init_irq, | 228 | .init_irq = kirkwood_init_irq, |
229 | .timer = &kirkwood_timer, | 229 | .init_time = kirkwood_timer_init, |
230 | .restart = kirkwood_restart, | 230 | .restart = kirkwood_restart, |
231 | MACHINE_END | 231 | MACHINE_END |
diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c index c49b177c1523..5a369fe74754 100644 --- a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c +++ b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c | |||
@@ -103,6 +103,6 @@ MACHINE_START(DB88F6281_BP, "Marvell DB-88F6281-BP Development Board") | |||
103 | .map_io = kirkwood_map_io, | 103 | .map_io = kirkwood_map_io, |
104 | .init_early = kirkwood_init_early, | 104 | .init_early = kirkwood_init_early, |
105 | .init_irq = kirkwood_init_irq, | 105 | .init_irq = kirkwood_init_irq, |
106 | .timer = &kirkwood_timer, | 106 | .init_time = kirkwood_timer_init, |
107 | .restart = kirkwood_restart, | 107 | .restart = kirkwood_restart, |
108 | MACHINE_END | 108 | MACHINE_END |
diff --git a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c index 272af6970f61..060ccf9cb63f 100644 --- a/arch/arm/mach-kirkwood/dockstar-setup.c +++ b/arch/arm/mach-kirkwood/dockstar-setup.c | |||
@@ -106,6 +106,6 @@ MACHINE_START(DOCKSTAR, "Seagate FreeAgent DockStar") | |||
106 | .map_io = kirkwood_map_io, | 106 | .map_io = kirkwood_map_io, |
107 | .init_early = kirkwood_init_early, | 107 | .init_early = kirkwood_init_early, |
108 | .init_irq = kirkwood_init_irq, | 108 | .init_irq = kirkwood_init_irq, |
109 | .timer = &kirkwood_timer, | 109 | .init_time = kirkwood_timer_init, |
110 | .restart = kirkwood_restart, | 110 | .restart = kirkwood_restart, |
111 | MACHINE_END | 111 | MACHINE_END |
diff --git a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c index 7cb55f982243..1c6e736cbbf8 100644 --- a/arch/arm/mach-kirkwood/guruplug-setup.c +++ b/arch/arm/mach-kirkwood/guruplug-setup.c | |||
@@ -126,6 +126,6 @@ MACHINE_START(GURUPLUG, "Marvell GuruPlug Reference Board") | |||
126 | .map_io = kirkwood_map_io, | 126 | .map_io = kirkwood_map_io, |
127 | .init_early = kirkwood_init_early, | 127 | .init_early = kirkwood_init_early, |
128 | .init_irq = kirkwood_init_irq, | 128 | .init_irq = kirkwood_init_irq, |
129 | .timer = &kirkwood_timer, | 129 | .init_time = kirkwood_timer_init, |
130 | .restart = kirkwood_restart, | 130 | .restart = kirkwood_restart, |
131 | MACHINE_END | 131 | MACHINE_END |
diff --git a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c index 6d8364a97810..ba384b992bef 100644 --- a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c +++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | |||
@@ -167,6 +167,6 @@ MACHINE_START(MV88F6281GTW_GE, "Marvell 88F6281 GTW GE Board") | |||
167 | .map_io = kirkwood_map_io, | 167 | .map_io = kirkwood_map_io, |
168 | .init_early = kirkwood_init_early, | 168 | .init_early = kirkwood_init_early, |
169 | .init_irq = kirkwood_init_irq, | 169 | .init_irq = kirkwood_init_irq, |
170 | .timer = &kirkwood_timer, | 170 | .init_time = kirkwood_timer_init, |
171 | .restart = kirkwood_restart, | 171 | .restart = kirkwood_restart, |
172 | MACHINE_END | 172 | MACHINE_END |
diff --git a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/netspace_v2-setup.c index 728e86d33f0c..3b706611da8e 100644 --- a/arch/arm/mach-kirkwood/netspace_v2-setup.c +++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c | |||
@@ -263,7 +263,7 @@ MACHINE_START(NETSPACE_V2, "LaCie Network Space v2") | |||
263 | .map_io = kirkwood_map_io, | 263 | .map_io = kirkwood_map_io, |
264 | .init_early = kirkwood_init_early, | 264 | .init_early = kirkwood_init_early, |
265 | .init_irq = kirkwood_init_irq, | 265 | .init_irq = kirkwood_init_irq, |
266 | .timer = &kirkwood_timer, | 266 | .init_time = kirkwood_timer_init, |
267 | .restart = kirkwood_restart, | 267 | .restart = kirkwood_restart, |
268 | MACHINE_END | 268 | MACHINE_END |
269 | #endif | 269 | #endif |
@@ -275,7 +275,7 @@ MACHINE_START(INETSPACE_V2, "LaCie Internet Space v2") | |||
275 | .map_io = kirkwood_map_io, | 275 | .map_io = kirkwood_map_io, |
276 | .init_early = kirkwood_init_early, | 276 | .init_early = kirkwood_init_early, |
277 | .init_irq = kirkwood_init_irq, | 277 | .init_irq = kirkwood_init_irq, |
278 | .timer = &kirkwood_timer, | 278 | .init_time = kirkwood_timer_init, |
279 | .restart = kirkwood_restart, | 279 | .restart = kirkwood_restart, |
280 | MACHINE_END | 280 | MACHINE_END |
281 | #endif | 281 | #endif |
@@ -287,7 +287,7 @@ MACHINE_START(NETSPACE_MAX_V2, "LaCie Network Space Max v2") | |||
287 | .map_io = kirkwood_map_io, | 287 | .map_io = kirkwood_map_io, |
288 | .init_early = kirkwood_init_early, | 288 | .init_early = kirkwood_init_early, |
289 | .init_irq = kirkwood_init_irq, | 289 | .init_irq = kirkwood_init_irq, |
290 | .timer = &kirkwood_timer, | 290 | .init_time = kirkwood_timer_init, |
291 | .restart = kirkwood_restart, | 291 | .restart = kirkwood_restart, |
292 | MACHINE_END | 292 | MACHINE_END |
293 | #endif | 293 | #endif |
diff --git a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/netxbig_v2-setup.c index a3b091470b8a..913d032cdb19 100644 --- a/arch/arm/mach-kirkwood/netxbig_v2-setup.c +++ b/arch/arm/mach-kirkwood/netxbig_v2-setup.c | |||
@@ -404,7 +404,7 @@ MACHINE_START(NET2BIG_V2, "LaCie 2Big Network v2") | |||
404 | .map_io = kirkwood_map_io, | 404 | .map_io = kirkwood_map_io, |
405 | .init_early = kirkwood_init_early, | 405 | .init_early = kirkwood_init_early, |
406 | .init_irq = kirkwood_init_irq, | 406 | .init_irq = kirkwood_init_irq, |
407 | .timer = &kirkwood_timer, | 407 | .init_time = kirkwood_timer_init, |
408 | .restart = kirkwood_restart, | 408 | .restart = kirkwood_restart, |
409 | MACHINE_END | 409 | MACHINE_END |
410 | #endif | 410 | #endif |
@@ -416,7 +416,7 @@ MACHINE_START(NET5BIG_V2, "LaCie 5Big Network v2") | |||
416 | .map_io = kirkwood_map_io, | 416 | .map_io = kirkwood_map_io, |
417 | .init_early = kirkwood_init_early, | 417 | .init_early = kirkwood_init_early, |
418 | .init_irq = kirkwood_init_irq, | 418 | .init_irq = kirkwood_init_irq, |
419 | .timer = &kirkwood_timer, | 419 | .init_time = kirkwood_timer_init, |
420 | .restart = kirkwood_restart, | 420 | .restart = kirkwood_restart, |
421 | MACHINE_END | 421 | MACHINE_END |
422 | #endif | 422 | #endif |
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c index 7e81e9b586bf..8ddd69fdc937 100644 --- a/arch/arm/mach-kirkwood/openrd-setup.c +++ b/arch/arm/mach-kirkwood/openrd-setup.c | |||
@@ -221,7 +221,7 @@ MACHINE_START(OPENRD_BASE, "Marvell OpenRD Base Board") | |||
221 | .map_io = kirkwood_map_io, | 221 | .map_io = kirkwood_map_io, |
222 | .init_early = kirkwood_init_early, | 222 | .init_early = kirkwood_init_early, |
223 | .init_irq = kirkwood_init_irq, | 223 | .init_irq = kirkwood_init_irq, |
224 | .timer = &kirkwood_timer, | 224 | .init_time = kirkwood_timer_init, |
225 | .restart = kirkwood_restart, | 225 | .restart = kirkwood_restart, |
226 | MACHINE_END | 226 | MACHINE_END |
227 | #endif | 227 | #endif |
@@ -234,7 +234,7 @@ MACHINE_START(OPENRD_CLIENT, "Marvell OpenRD Client Board") | |||
234 | .map_io = kirkwood_map_io, | 234 | .map_io = kirkwood_map_io, |
235 | .init_early = kirkwood_init_early, | 235 | .init_early = kirkwood_init_early, |
236 | .init_irq = kirkwood_init_irq, | 236 | .init_irq = kirkwood_init_irq, |
237 | .timer = &kirkwood_timer, | 237 | .init_time = kirkwood_timer_init, |
238 | .restart = kirkwood_restart, | 238 | .restart = kirkwood_restart, |
239 | MACHINE_END | 239 | MACHINE_END |
240 | #endif | 240 | #endif |
@@ -247,7 +247,7 @@ MACHINE_START(OPENRD_ULTIMATE, "Marvell OpenRD Ultimate Board") | |||
247 | .map_io = kirkwood_map_io, | 247 | .map_io = kirkwood_map_io, |
248 | .init_early = kirkwood_init_early, | 248 | .init_early = kirkwood_init_early, |
249 | .init_irq = kirkwood_init_irq, | 249 | .init_irq = kirkwood_init_irq, |
250 | .timer = &kirkwood_timer, | 250 | .init_time = kirkwood_timer_init, |
251 | .restart = kirkwood_restart, | 251 | .restart = kirkwood_restart, |
252 | MACHINE_END | 252 | MACHINE_END |
253 | #endif | 253 | #endif |
diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c index 19072c84008f..e4fd3129d36f 100644 --- a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c +++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | |||
@@ -84,6 +84,6 @@ MACHINE_START(RD88F6192_NAS, "Marvell RD-88F6192-NAS Development Board") | |||
84 | .map_io = kirkwood_map_io, | 84 | .map_io = kirkwood_map_io, |
85 | .init_early = kirkwood_init_early, | 85 | .init_early = kirkwood_init_early, |
86 | .init_irq = kirkwood_init_irq, | 86 | .init_irq = kirkwood_init_irq, |
87 | .timer = &kirkwood_timer, | 87 | .init_time = kirkwood_timer_init, |
88 | .restart = kirkwood_restart, | 88 | .restart = kirkwood_restart, |
89 | MACHINE_END | 89 | MACHINE_END |
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c index 9717101a7437..c7d93b48926b 100644 --- a/arch/arm/mach-kirkwood/rd88f6281-setup.c +++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c | |||
@@ -120,6 +120,6 @@ MACHINE_START(RD88F6281, "Marvell RD-88F6281 Reference Board") | |||
120 | .map_io = kirkwood_map_io, | 120 | .map_io = kirkwood_map_io, |
121 | .init_early = kirkwood_init_early, | 121 | .init_early = kirkwood_init_early, |
122 | .init_irq = kirkwood_init_irq, | 122 | .init_irq = kirkwood_init_irq, |
123 | .timer = &kirkwood_timer, | 123 | .init_time = kirkwood_timer_init, |
124 | .restart = kirkwood_restart, | 124 | .restart = kirkwood_restart, |
125 | MACHINE_END | 125 | MACHINE_END |
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c index 8a175948b28d..55b68fa39f45 100644 --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c +++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c | |||
@@ -143,7 +143,7 @@ MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board") | |||
143 | .map_io = kirkwood_map_io, | 143 | .map_io = kirkwood_map_io, |
144 | .init_early = kirkwood_init_early, | 144 | .init_early = kirkwood_init_early, |
145 | .init_irq = kirkwood_init_irq, | 145 | .init_irq = kirkwood_init_irq, |
146 | .timer = &kirkwood_timer, | 146 | .init_time = kirkwood_timer_init, |
147 | .restart = kirkwood_restart, | 147 | .restart = kirkwood_restart, |
148 | MACHINE_END | 148 | MACHINE_END |
149 | #endif | 149 | #endif |
@@ -155,7 +155,7 @@ MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board") | |||
155 | .map_io = kirkwood_map_io, | 155 | .map_io = kirkwood_map_io, |
156 | .init_early = kirkwood_init_early, | 156 | .init_early = kirkwood_init_early, |
157 | .init_irq = kirkwood_init_irq, | 157 | .init_irq = kirkwood_init_irq, |
158 | .timer = &kirkwood_timer, | 158 | .init_time = kirkwood_timer_init, |
159 | .restart = kirkwood_restart, | 159 | .restart = kirkwood_restart, |
160 | MACHINE_END | 160 | MACHINE_END |
161 | #endif | 161 | #endif |
diff --git a/arch/arm/mach-kirkwood/t5325-setup.c b/arch/arm/mach-kirkwood/t5325-setup.c index f2daf711e72e..8736f8c97518 100644 --- a/arch/arm/mach-kirkwood/t5325-setup.c +++ b/arch/arm/mach-kirkwood/t5325-setup.c | |||
@@ -211,6 +211,6 @@ MACHINE_START(T5325, "HP t5325 Thin Client") | |||
211 | .map_io = kirkwood_map_io, | 211 | .map_io = kirkwood_map_io, |
212 | .init_early = kirkwood_init_early, | 212 | .init_early = kirkwood_init_early, |
213 | .init_irq = kirkwood_init_irq, | 213 | .init_irq = kirkwood_init_irq, |
214 | .timer = &kirkwood_timer, | 214 | .init_time = kirkwood_timer_init, |
215 | .restart = kirkwood_restart, | 215 | .restart = kirkwood_restart, |
216 | MACHINE_END | 216 | MACHINE_END |
diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c index 73e2b6ca9564..283abff90228 100644 --- a/arch/arm/mach-kirkwood/ts219-setup.c +++ b/arch/arm/mach-kirkwood/ts219-setup.c | |||
@@ -137,6 +137,6 @@ MACHINE_START(TS219, "QNAP TS-119/TS-219") | |||
137 | .map_io = kirkwood_map_io, | 137 | .map_io = kirkwood_map_io, |
138 | .init_early = kirkwood_init_early, | 138 | .init_early = kirkwood_init_early, |
139 | .init_irq = kirkwood_init_irq, | 139 | .init_irq = kirkwood_init_irq, |
140 | .timer = &kirkwood_timer, | 140 | .init_time = kirkwood_timer_init, |
141 | .restart = kirkwood_restart, | 141 | .restart = kirkwood_restart, |
142 | MACHINE_END | 142 | MACHINE_END |
diff --git a/arch/arm/mach-kirkwood/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-setup.c index e4c61279ea86..81d585806b2f 100644 --- a/arch/arm/mach-kirkwood/ts41x-setup.c +++ b/arch/arm/mach-kirkwood/ts41x-setup.c | |||
@@ -181,6 +181,6 @@ MACHINE_START(TS41X, "QNAP TS-41x") | |||
181 | .map_io = kirkwood_map_io, | 181 | .map_io = kirkwood_map_io, |
182 | .init_early = kirkwood_init_early, | 182 | .init_early = kirkwood_init_early, |
183 | .init_irq = kirkwood_init_irq, | 183 | .init_irq = kirkwood_init_irq, |
184 | .timer = &kirkwood_timer, | 184 | .init_time = kirkwood_timer_init, |
185 | .restart = kirkwood_restart, | 185 | .restart = kirkwood_restart, |
186 | MACHINE_END | 186 | MACHINE_END |