git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
arm
/
mach-sa1100
/
dma.c
diff --git
a/arch/arm/mach-sa1100/dma.c
b/arch/arm/mach-sa1100/dma.c
index
be0e442
..
3c6441d
100644
(file)
--- 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,
i = dma - dma_chan;
regs = (dma_regs_t *)&DDAR(i);
- err = request_irq(IRQ_DMA0 + i, dma_irq_handler,
SA_INTERRUPT
,
+ err = request_irq(IRQ_DMA0 + i, dma_irq_handler,
IRQF_DISABLED
,
device_id, regs);
if (err) {
printk(KERN_ERR