projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[powerpc.git]
/
kernel
/
dma.c
diff --git
a/kernel/dma.c
b/kernel/dma.c
index
937b13c
..
6a82bb7
100644
(file)
--- a/
kernel/dma.c
+++ b/
kernel/dma.c
@@
-20,7
+20,7
@@
#include <asm/dma.h>
#include <asm/system.h>
#include <asm/dma.h>
#include <asm/system.h>
-
+
/* A note on resource allocation:
*
/* A note on resource allocation:
*
@@
-95,7
+95,7
@@
void free_dma(unsigned int dmanr)
if (xchg(&dma_chan_busy[dmanr].lock, 0) == 0) {
printk(KERN_WARNING "Trying to free free DMA%d\n", dmanr);
return;
if (xchg(&dma_chan_busy[dmanr].lock, 0) == 0) {
printk(KERN_WARNING "Trying to free free DMA%d\n", dmanr);
return;
- }
+ }
} /* free_dma */
} /* free_dma */
@@
-121,8
+121,8
@@
static int proc_dma_show(struct seq_file *m, void *v)
for (i = 0 ; i < MAX_DMA_CHANNELS ; i++) {
if (dma_chan_busy[i].lock) {
for (i = 0 ; i < MAX_DMA_CHANNELS ; i++) {
if (dma_chan_busy[i].lock) {
- seq_printf(m, "%2d: %s\n", i,
- dma_chan_busy[i].device_id);
+
seq_printf(m, "%2d: %s\n", i,
+
dma_chan_busy[i].device_id);
}
}
return 0;
}
}
return 0;