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 master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2410
/
dma.c
diff --git
a/arch/arm/mach-s3c2410/dma.c
b/arch/arm/mach-s3c2410/dma.c
index
d264bbb
..
01abb0a
100644
(file)
--- a/
arch/arm/mach-s3c2410/dma.c
+++ b/
arch/arm/mach-s3c2410/dma.c
@@
-40,7
+40,7
@@
/* io map for dma */
static void __iomem *dma_base;
/* io map for dma */
static void __iomem *dma_base;
-static
kmem_cache_t
*dma_kmem;
+static
struct kmem_cache
*dma_kmem;
struct s3c24xx_dma_selection dma_sel;
struct s3c24xx_dma_selection dma_sel;
@@
-595,7
+595,7
@@
s3c2410_dma_lastxfer(struct s3c2410_dma_chan *chan)
#define dmadbg2(x...)
static irqreturn_t
#define dmadbg2(x...)
static irqreturn_t
-s3c2410_dma_irq(int irq, void *devpw
, struct pt_regs *regs
)
+s3c2410_dma_irq(int irq, void *devpw)
{
struct s3c2410_dma_chan *chan = (struct s3c2410_dma_chan *)devpw;
struct s3c2410_dma_buf *buf;
{
struct s3c2410_dma_chan *chan = (struct s3c2410_dma_chan *)devpw;
struct s3c2410_dma_buf *buf;
@@
-1271,7
+1271,7
@@
struct sysdev_class dma_sysclass = {
/* kmem cache implementation */
/* kmem cache implementation */
-static void s3c2410_dma_cache_ctor(void *p,
kmem_cache_t
*c, unsigned long f)
+static void s3c2410_dma_cache_ctor(void *p,
struct kmem_cache
*c, unsigned long f)
{
memset(p, 0, sizeof(struct s3c2410_dma_buf));
}
{
memset(p, 0, sizeof(struct s3c2410_dma_buf));
}