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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
arm
/
mach-s3c2410
/
dma.c
diff --git
a/arch/arm/mach-s3c2410/dma.c
b/arch/arm/mach-s3c2410/dma.c
index
c7c2889
..
4dbd8e7
100644
(file)
--- a/
arch/arm/mach-s3c2410/dma.c
+++ b/
arch/arm/mach-s3c2410/dma.c
@@
-436,7
+436,7
@@
int s3c2410_dma_enqueue(unsigned int channel, void *id,
buf = kmem_cache_alloc(dma_kmem, GFP_ATOMIC);
if (buf == NULL) {
buf = kmem_cache_alloc(dma_kmem, GFP_ATOMIC);
if (buf == NULL) {
- pr_debug("%s: out of memory (%d alloc)\n",
+ pr_debug("%s: out of memory (%
l
d alloc)\n",
__FUNCTION__, sizeof(*buf));
return -ENOMEM;
}
__FUNCTION__, sizeof(*buf));
return -ENOMEM;
}
@@
-1152,7
+1152,7
@@
static int __init s3c2410_init_dma(void)
printk("S3C2410 DMA Driver, (c) 2003-2004 Simtec Electronics\n");
printk("S3C2410 DMA Driver, (c) 2003-2004 Simtec Electronics\n");
- dma_base = ioremap(S3C24
10
_PA_DMA, 0x200);
+ dma_base = ioremap(S3C24
XX
_PA_DMA, 0x200);
if (dma_base == NULL) {
printk(KERN_ERR "dma failed to remap register block\n");
return -ENOMEM;
if (dma_base == NULL) {
printk(KERN_ERR "dma failed to remap register block\n");
return -ENOMEM;