diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
| commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
| tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /arch/arm/mach-pxa/dma.c | |
| parent | 5e226e4d9016daee170699f8a4188a5505021756 (diff) | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/dma.c')
| -rw-r--r-- | arch/arm/mach-pxa/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/dma.c b/arch/arm/mach-pxa/dma.c index 93c4f31f127f..3215316d7b06 100644 --- 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) | |||
| 81 | if (!dma_channels[dma_ch].name) { | 81 | if (!dma_channels[dma_ch].name) { |
| 82 | printk (KERN_CRIT | 82 | printk (KERN_CRIT |
| 83 | "%s: trying to free channel %d which is already freed\n", | 83 | "%s: trying to free channel %d which is already freed\n", |
| 84 | __FUNCTION__, dma_ch); | 84 | __func__, dma_ch); |
| 85 | return; | 85 | return; |
| 86 | } | 86 | } |
| 87 | 87 | ||