Merge branch 'audit.b56' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...

[linux-2.6-omap-h63xx.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;
        }