git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/mtd-2.6
[pandora-kernel.git]
/
arch
/
sh
/
drivers
/
dma
/
dma-pvr2.c
diff --git
a/arch/sh/drivers/dma/dma-pvr2.c
b/arch/sh/drivers/dma/dma-pvr2.c
index
30a580a
..
391cbe1
100644
(file)
--- a/
arch/sh/drivers/dma/dma-pvr2.c
+++ b/
arch/sh/drivers/dma/dma-pvr2.c
@@
-1,5
+1,5
@@
/*
/*
- * arch/sh/
boards/dreamcast
/dma-pvr2.c
+ * arch/sh/
drivers/dma
/dma-pvr2.c
*
* NEC PowerVR 2 (Dreamcast) DMA support
*
*
* NEC PowerVR 2 (Dreamcast) DMA support
*
@@
-13,15
+13,15
@@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/interrupt.h>
-#include <
asm/
mach/sysasic.h>
-#include <
asm/
mach/dma.h>
+#include <mach/sysasic.h>
+#include <mach/dma.h>
#include <asm/dma.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/io.h>
-static unsigned int xfer_complete
= 0
;
-static int count
= 0
;
+static unsigned int xfer_complete;
+static int count;
-static irqreturn_t pvr2_dma_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t pvr2_dma_interrupt(int irq, void *dev_id)
{
if (get_dma_residue(PVR2_CASCADE_CHAN)) {
printk(KERN_WARNING "DMA: SH DMAC did not complete transfer "
{
if (get_dma_residue(PVR2_CASCADE_CHAN)) {
printk(KERN_WARNING "DMA: SH DMAC did not complete transfer "
@@
-107,4
+107,3
@@
module_exit(pvr2_dma_exit);
MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>");
MODULE_DESCRIPTION("NEC PowerVR 2 DMA driver");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>");
MODULE_DESCRIPTION("NEC PowerVR 2 DMA driver");
MODULE_LICENSE("GPL");
-