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-s3c2410/s3c244x-irq.c | |
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-s3c2410/s3c244x-irq.c')
-rw-r--r-- | arch/arm/mach-s3c2410/s3c244x-irq.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2410/s3c244x-irq.c b/arch/arm/mach-s3c2410/s3c244x-irq.c index ec702f88b299..146f2109dd90 100644 --- a/arch/arm/mach-s3c2410/s3c244x-irq.c +++ b/arch/arm/mach-s3c2410/s3c244x-irq.c | |||
@@ -42,8 +42,7 @@ | |||
42 | /* camera irq */ | 42 | /* camera irq */ |
43 | 43 | ||
44 | static void s3c_irq_demux_cam(unsigned int irq, | 44 | static void s3c_irq_demux_cam(unsigned int irq, |
45 | struct irqdesc *desc, | 45 | struct irqdesc *desc) |
46 | struct pt_regs *regs) | ||
47 | { | 46 | { |
48 | unsigned int subsrc, submsk; | 47 | unsigned int subsrc, submsk; |
49 | struct irqdesc *mydesc; | 48 | struct irqdesc *mydesc; |
@@ -61,11 +60,11 @@ static void s3c_irq_demux_cam(unsigned int irq, | |||
61 | if (subsrc != 0) { | 60 | if (subsrc != 0) { |
62 | if (subsrc & 1) { | 61 | if (subsrc & 1) { |
63 | mydesc = irq_desc + IRQ_S3C2440_CAM_C; | 62 | mydesc = irq_desc + IRQ_S3C2440_CAM_C; |
64 | desc_handle_irq(IRQ_S3C2440_CAM_C, mydesc, regs); | 63 | desc_handle_irq(IRQ_S3C2440_CAM_C, mydesc); |
65 | } | 64 | } |
66 | if (subsrc & 2) { | 65 | if (subsrc & 2) { |
67 | mydesc = irq_desc + IRQ_S3C2440_CAM_P; | 66 | mydesc = irq_desc + IRQ_S3C2440_CAM_P; |
68 | desc_handle_irq(IRQ_S3C2440_CAM_P, mydesc, regs); | 67 | desc_handle_irq(IRQ_S3C2440_CAM_P, mydesc); |
69 | } | 68 | } |
70 | } | 69 | } |
71 | } | 70 | } |