From b2170edaf765d8ccbd9310167b4f02f35d019531 Mon Sep 17 00:00:00 2001 From: Scott Wood Date: Fri, 12 Oct 2007 15:19:11 -0500 Subject: [PATCH] --- yaml --- r: 73571 b: refs/heads/master c: 4c011b1fb853776459c7d3d7de7b14fa41f28c46 h: refs/heads/master i: 73569: 00d03646ddc6973576d9af8fda781d9b3c64f715 73567: 079f9ec93c839dee046f6656588b01273ff6dbc9 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/sysdev/cpm_common.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f23ee261f84f..68a95df71278 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0197cd2e350a7151080e7335577e956f1f84a8cb +refs/heads/master: 4c011b1fb853776459c7d3d7de7b14fa41f28c46 diff --git a/trunk/arch/powerpc/sysdev/cpm_common.c b/trunk/arch/powerpc/sysdev/cpm_common.c index 66c8ad4cfce6..165981c87786 100644 --- a/trunk/arch/powerpc/sysdev/cpm_common.c +++ b/trunk/arch/powerpc/sysdev/cpm_common.c @@ -77,8 +77,6 @@ int __init cpm_muram_init(void) int i = 0; int ret = 0; - printk("cpm_muram_init\n"); - spin_lock_init(&cpm_muram_lock); /* initialize the info header */ rh_init(&cpm_muram_info, 1, @@ -193,7 +191,7 @@ void __iomem *cpm_muram_addr(unsigned long offset) EXPORT_SYMBOL(cpm_muram_addr); /** - * cpm_muram_phys - turn a muram virtual address into a DMA address + * cpm_muram_dma - turn a muram virtual address into a DMA address * @offset: virtual address from cpm_muram_addr() to convert */ dma_addr_t cpm_muram_dma(void __iomem *addr)