Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index e2ed6dd252b9..53dde0607362 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -328,7 +328,7 @@ int arch_add_memory(int nid, u64 start, u64 size)
         /* We only have ZONE_NORMAL, so this is easy.. */
         ret = __add_pages(pgdat->node_zones + ZONE_NORMAL, start_pfn, nr_pages);
         if (unlikely(ret))
-                printk("%s: Failed, __add_pages() == %d\n", __FUNCTION__, ret);
+                printk("%s: Failed, __add_pages() == %d\n", __func__, ret);
 
         return ret;
 }