diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:33:02 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:33:02 -0400 |
commit | 3f30a09a612bac2b531a206c2a58a292dd7ff182 (patch) | |
tree | 62741c2f78aeb3009c66dbcf014ebff2e034e597 /arch/arm/mach-s3c2440/irq.c | |
parent | 9e165acf1b9e37af7c0fa39399b43d0bd8600039 (diff) | |
parent | fda50a1c49ad7483eaa29a268d560422c413933f (diff) |
Merge branch 'pxa-all' into devel
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'arch/arm/mach-s3c2440/irq.c')
-rw-r--r-- | arch/arm/mach-s3c2440/irq.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2440/irq.c b/arch/arm/mach-s3c2440/irq.c index 93fff75220cf..33e3ede0a2b3 100644 --- a/arch/arm/mach-s3c2440/irq.c +++ b/arch/arm/mach-s3c2440/irq.c | |||
@@ -44,7 +44,6 @@ static void s3c_irq_demux_wdtac97(unsigned int irq, | |||
44 | struct irq_desc *desc) | 44 | struct irq_desc *desc) |
45 | { | 45 | { |
46 | unsigned int subsrc, submsk; | 46 | unsigned int subsrc, submsk; |
47 | struct irq_desc *mydesc; | ||
48 | 47 | ||
49 | /* read the current pending interrupts, and the mask | 48 | /* read the current pending interrupts, and the mask |
50 | * for what it is available */ | 49 | * for what it is available */ |
@@ -58,12 +57,10 @@ static void s3c_irq_demux_wdtac97(unsigned int irq, | |||
58 | 57 | ||
59 | if (subsrc != 0) { | 58 | if (subsrc != 0) { |
60 | if (subsrc & 1) { | 59 | if (subsrc & 1) { |
61 | mydesc = irq_desc + IRQ_S3C2440_WDT; | 60 | generic_handle_irq(IRQ_S3C2440_WDT); |
62 | desc_handle_irq(IRQ_S3C2440_WDT, mydesc); | ||
63 | } | 61 | } |
64 | if (subsrc & 2) { | 62 | if (subsrc & 2) { |
65 | mydesc = irq_desc + IRQ_S3C2440_AC97; | 63 | generic_handle_irq(IRQ_S3C2440_AC97); |
66 | desc_handle_irq(IRQ_S3C2440_AC97, mydesc); | ||
67 | } | 64 | } |
68 | } | 65 | } |
69 | } | 66 | } |