Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / arch / arm / mach-iop13xx / setup.c

diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c
index bfe0c87e33976e96fad4f673fc3ca334d5dcbf81..246f6d4787209fb526e4680426d629bbf5938569 100644 (file)
--- a/arch/arm/mach-iop13xx/setup.c
+++ b/arch/arm/mach-iop13xx/setup.c
@@ -519,7 +519,7 @@ void __init iop13xx_platform_init(void)
        if (iq8134x_flash_resource.end > iq8134x_flash_resource.start)
                iop13xx_devices[plat_idx++] = &iq8134x_flash;
        else
-               printk(KERN_ERR "%s: Failed to probe flash size\n", __FUNCTION__);
+               printk(KERN_ERR "%s: Failed to probe flash size\n", __func__);
 #endif
 
        platform_add_devices(iop13xx_devices, plat_idx);