Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / drivers / parisc / led.c

diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index a6d6b2488ffc267c475a09c849f5f18c73e53cbb..f9b12664f9fb90c24e07ce2cc6f49cd8769a81cd 100644 (file)
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -364,7 +364,7 @@ static __inline__ int led_get_net_activity(void)
            struct in_device *in_dev = __in_dev_get_rcu(dev);
            if (!in_dev || !in_dev->ifa_list)
                continue;
-           if (LOOPBACK(in_dev->ifa_list->ifa_local))
+           if (ipv4_is_loopback(in_dev->ifa_list->ifa_local))
                continue;
            stats = dev->get_stats(dev);
            rx_total += stats->rx_packets;
@@ -569,7 +569,7 @@ int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long d
 
        default:
                printk(KERN_ERR "%s: Wrong LCD/LED model %d !\n",
-                      __FUNCTION__, lcd_info.model);
+                      __func__, lcd_info.model);
                return 1;
        }