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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
arch
/
sh
/
drivers
/
dma
/
dma-sh.c
diff --git
a/arch/sh/drivers/dma/dma-sh.c
b/arch/sh/drivers/dma/dma-sh.c
index
e028a2d
..
cca26c4
100644
(file)
--- a/
arch/sh/drivers/dma/dma-sh.c
+++ b/
arch/sh/drivers/dma/dma-sh.c
@@
-12,6
+12,7
@@
* for more details.
*/
* for more details.
*/
+#include <linux/config.h>
#include <linux/init.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
@@
-90,7
+91,7
@@
static int sh_dmac_request_dma(struct dma_channel *chan)
chan->chan);
return request_irq(get_dmte_irq(chan->chan), dma_tei,
chan->chan);
return request_irq(get_dmte_irq(chan->chan), dma_tei,
-
IRQF_DISABLED
, name, chan);
+
SA_INTERRUPT
, name, chan);
}
static void sh_dmac_free_dma(struct dma_channel *chan)
}
static void sh_dmac_free_dma(struct dma_channel *chan)
@@
-258,7
+259,7
@@
static int __init sh_dmac_init(void)
#ifdef CONFIG_CPU_SH4
make_ipr_irq(DMAE_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY);
#ifdef CONFIG_CPU_SH4
make_ipr_irq(DMAE_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY);
- i = request_irq(DMAE_IRQ, dma_err,
IRQF_DISABLED
, "DMAC Address Error", 0);
+ i = request_irq(DMAE_IRQ, dma_err,
SA_INTERRUPT
, "DMAC Address Error", 0);
if (i < 0)
return i;
#endif
if (i < 0)
return i;
#endif