diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
| commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
| tree | 2624a44924c625c367f3cebf937853b9da2de282 /arch/arm/mach-sa1100/dma.c | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'arch/arm/mach-sa1100/dma.c')
| -rw-r--r-- | arch/arm/mach-sa1100/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/dma.c b/arch/arm/mach-sa1100/dma.c index be0e4427bec7..3c6441d4bc59 100644 --- a/arch/arm/mach-sa1100/dma.c +++ b/arch/arm/mach-sa1100/dma.c | |||
| @@ -124,7 +124,7 @@ int sa1100_request_dma (dma_device_t device, const char *device_id, | |||
| 124 | 124 | ||
| 125 | i = dma - dma_chan; | 125 | i = dma - dma_chan; |
| 126 | regs = (dma_regs_t *)&DDAR(i); | 126 | regs = (dma_regs_t *)&DDAR(i); |
| 127 | err = request_irq(IRQ_DMA0 + i, dma_irq_handler, SA_INTERRUPT, | 127 | err = request_irq(IRQ_DMA0 + i, dma_irq_handler, IRQF_DISABLED, |
| 128 | device_id, regs); | 128 | device_id, regs); |
| 129 | if (err) { | 129 | if (err) { |
| 130 | printk(KERN_ERR | 130 | printk(KERN_ERR |