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

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

diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index 703b85edb004b3d5b9f7dca1286ad4cba156291f..454b6532e40998cce76aa3eeb7ed8fdaa901748a 100644 (file)
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -360,13 +360,13 @@ static __inline__ int led_get_net_activity(void)
        read_lock(&dev_base_lock);
        rcu_read_lock();
        for_each_netdev(&init_net, dev) {
-           struct net_device_stats *stats;
+           const struct net_device_stats *stats;
            struct in_device *in_dev = __in_dev_get_rcu(dev);
            if (!in_dev || !in_dev->ifa_list)
                continue;
            if (ipv4_is_loopback(in_dev->ifa_list->ifa_local))
                continue;
-           stats = dev->get_stats(dev);
+           stats = dev_get_stats(dev);
            rx_total += stats->rx_packets;
            tx_total += stats->tx_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;
        }