git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
dma.c
diff --git
a/arch/arm/mach-pxa/dma.c
b/arch/arm/mach-pxa/dma.c
index 93c4f31f127faa053dcd555f5fe7aa66fb5aee34..3215316d7b063fe31ff5a5cc4b3867f40a4344d7 100644
(file)
--- a/
arch/arm/mach-pxa/dma.c
+++ b/
arch/arm/mach-pxa/dma.c
@@
-81,7
+81,7
@@
void pxa_free_dma (int dma_ch)
if (!dma_channels[dma_ch].name) {
printk (KERN_CRIT
"%s: trying to free channel %d which is already freed\n",
- __
FUNCTION
__, dma_ch);
+ __
func
__, dma_ch);
return;
}