Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / arch / arm / mach-sa1100 / badge4.c

diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c
index f60b7a66dfa022bc66699a7e26b151cb8c1f1c58..842d9e6dc5ff77c94c802baa47647cba879ed73a 100644 (file)
--- a/arch/arm/mach-sa1100/badge4.c
+++ b/arch/arm/mach-sa1100/badge4.c
@@ -206,7 +206,7 @@ static int __init badge4_init(void)
        if (ret < 0)
                printk(KERN_ERR
                       "%s: SA-1111 initialization failed (%d)\n",
-                      __FUNCTION__, ret);
+                      __func__, ret);
 
 
        /* maybe turn on 5v0 from the start */
@@ -240,11 +240,11 @@ void badge4_set_5V(unsigned subsystem, int on)
        /* detect on->off and off->on transitions */
        if ((!old_5V_bitmap) && (badge4_5V_bitmap)) {
                /* was off, now on */
-               printk(KERN_INFO "%s: enabling 5V supply rail\n", __FUNCTION__);
+               printk(KERN_INFO "%s: enabling 5V supply rail\n", __func__);
                GPSR = BADGE4_GPIO_PCMEN5V;
        } else if ((old_5V_bitmap) && (!badge4_5V_bitmap)) {
                /* was on, now off */
-               printk(KERN_INFO "%s: disabling 5V supply rail\n", __FUNCTION__);
+               printk(KERN_INFO "%s: disabling 5V supply rail\n", __func__);
                GPCR = BADGE4_GPIO_PCMEN5V;
        }