diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-24 20:01:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-24 20:01:45 -0400 |
| commit | 317ec6cd00f25d05d153a780bc178c5335f320ee (patch) | |
| tree | ebeab6da87789807d1852edd7228a73cafe4e493 /arch/arm/mach-s3c2443/irq.c | |
| parent | 0fa7d868ca456ddf4f41b700fd9dee186f8f4e12 (diff) | |
| parent | 53698d2537bc8c2b8fedc788b8b927da9a004f9b (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4278/1: configure pxa27x I2C SCL as "input"
[ARM] 4272/1: Missing symbol h1940_pm_return fix
[ARM] 4235/1: ns9xxx: declare the clock functions as "const"
[ARM] 4271/1: iop32x: fix ep80219 detection (support iq80219 platforms)
[ARM] 4270/2: mach-s3c2443/irq.c off by one error in dma irqs
Diffstat (limited to 'arch/arm/mach-s3c2443/irq.c')
| -rw-r--r-- | arch/arm/mach-s3c2443/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2443/irq.c b/arch/arm/mach-s3c2443/irq.c index 7a45b6dcb73e..756573595b88 100644 --- a/arch/arm/mach-s3c2443/irq.c +++ b/arch/arm/mach-s3c2443/irq.c | |||
| @@ -137,7 +137,7 @@ static struct irq_chip s3c2443_irq_lcd = { | |||
| 137 | 137 | ||
| 138 | static void s3c2443_irq_demux_dma(unsigned int irq, struct irq_desc *desc) | 138 | static void s3c2443_irq_demux_dma(unsigned int irq, struct irq_desc *desc) |
| 139 | { | 139 | { |
| 140 | s3c2443_irq_demux(IRQ_S3C2443_DMA1, 6); | 140 | s3c2443_irq_demux(IRQ_S3C2443_DMA0, 6); |
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | #define INTMSK_DMA (1UL << (IRQ_S3C2443_DMA - IRQ_EINT0)) | 143 | #define INTMSK_DMA (1UL << (IRQ_S3C2443_DMA - IRQ_EINT0)) |