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-rpc | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'arch/arm/mach-rpc')
| -rw-r--r-- | arch/arm/mach-rpc/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-rpc/dma.c b/arch/arm/mach-rpc/dma.c index bd86ffba8810..ac511d41d4d7 100644 --- a/arch/arm/mach-rpc/dma.c +++ b/arch/arm/mach-rpc/dma.c | |||
| @@ -128,7 +128,7 @@ static irqreturn_t iomd_dma_handle(int irq, void *dev_id, struct pt_regs *regs) | |||
| 128 | static int iomd_request_dma(dmach_t channel, dma_t *dma) | 128 | static int iomd_request_dma(dmach_t channel, dma_t *dma) |
| 129 | { | 129 | { |
| 130 | return request_irq(dma->dma_irq, iomd_dma_handle, | 130 | return request_irq(dma->dma_irq, iomd_dma_handle, |
| 131 | SA_INTERRUPT, dma->device_id, dma); | 131 | IRQF_DISABLED, dma->device_id, dma); |
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | static void iomd_free_dma(dmach_t channel, dma_t *dma) | 134 | static void iomd_free_dma(dmach_t channel, dma_t *dma) |