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-shark | |
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-shark')
-rw-r--r-- | arch/arm/mach-shark/core.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-shark/irq.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c index 1095df34fec0..0e480fae8ec5 100644 --- a/arch/arm/mach-shark/core.c +++ b/arch/arm/mach-shark/core.c | |||
@@ -80,10 +80,10 @@ static void __init shark_map_io(void) | |||
80 | #define HZ_TIME ((1193180 + HZ/2) / HZ) | 80 | #define HZ_TIME ((1193180 + HZ/2) / HZ) |
81 | 81 | ||
82 | static irqreturn_t | 82 | static irqreturn_t |
83 | shark_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 83 | shark_timer_interrupt(int irq, void *dev_id) |
84 | { | 84 | { |
85 | write_seqlock(&xtime_lock); | 85 | write_seqlock(&xtime_lock); |
86 | timer_tick(regs); | 86 | timer_tick(); |
87 | write_sequnlock(&xtime_lock); | 87 | write_sequnlock(&xtime_lock); |
88 | return IRQ_HANDLED; | 88 | return IRQ_HANDLED; |
89 | } | 89 | } |
diff --git a/arch/arm/mach-shark/irq.c b/arch/arm/mach-shark/irq.c index b227052296cf..297ecf130650 100644 --- a/arch/arm/mach-shark/irq.c +++ b/arch/arm/mach-shark/irq.c | |||
@@ -61,7 +61,7 @@ static void shark_enable_8259A_irq(unsigned int irq) | |||
61 | 61 | ||
62 | static void shark_ack_8259A_irq(unsigned int irq){} | 62 | static void shark_ack_8259A_irq(unsigned int irq){} |
63 | 63 | ||
64 | static irqreturn_t bogus_int(int irq, void *dev_id, struct pt_regs *regs) | 64 | static irqreturn_t bogus_int(int irq, void *dev_id) |
65 | { | 65 | { |
66 | printk("Got interrupt %i!\n",irq); | 66 | printk("Got interrupt %i!\n",irq); |
67 | return IRQ_NONE; | 67 | return IRQ_NONE; |