diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 13:53:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 13:59:54 -0400 |
commit | 0cd61b68c340a4f901a06e8bb5e0dea4353161c0 (patch) | |
tree | cfd72be941ecd172627a06dd61d98b55cec63a39 /arch/arm/mach-omap2 | |
parent | da104a83692cf07434ab3b20bf10093bdbc3f97e (diff) |
Initial blind fixup for arm for irq changes
Untested, but this should fix up the bulk of the totally mechanical
issues, and should make the actual detail fixing easier.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/board-apollon.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/timer-gp.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index c37b0e6d1248..03d6905ba490 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c | |||
@@ -203,7 +203,7 @@ static void __init apollon_led_init(void) | |||
203 | omap_set_gpio_dataout(LED2_GPIO15, 0); | 203 | omap_set_gpio_dataout(LED2_GPIO15, 0); |
204 | } | 204 | } |
205 | 205 | ||
206 | static irqreturn_t apollon_sw_interrupt(int irq, void *ignored, struct pt_regs *regs) | 206 | static irqreturn_t apollon_sw_interrupt(int irq, void *ignored) |
207 | { | 207 | { |
208 | static unsigned int led0, led1, led2; | 208 | static unsigned int led0, led1, led2; |
209 | 209 | ||
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c index fe5fd6d42dea..973189cd9766 100644 --- a/arch/arm/mach-omap2/timer-gp.c +++ b/arch/arm/mach-omap2/timer-gp.c | |||
@@ -37,13 +37,12 @@ static inline void omap2_gp_timer_start(unsigned long load_val) | |||
37 | omap_dm_timer_start(gptimer); | 37 | omap_dm_timer_start(gptimer); |
38 | } | 38 | } |
39 | 39 | ||
40 | static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id, | 40 | static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id) |
41 | struct pt_regs *regs) | ||
42 | { | 41 | { |
43 | write_seqlock(&xtime_lock); | 42 | write_seqlock(&xtime_lock); |
44 | 43 | ||
45 | omap_dm_timer_write_status(gptimer, OMAP_TIMER_INT_OVERFLOW); | 44 | omap_dm_timer_write_status(gptimer, OMAP_TIMER_INT_OVERFLOW); |
46 | timer_tick(regs); | 45 | timer_tick(); |
47 | 46 | ||
48 | write_sequnlock(&xtime_lock); | 47 | write_sequnlock(&xtime_lock); |
49 | 48 | ||