Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / drivers / net / spider_net.h

diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h
index a2fcdebc3790f884e6b5143980b47e0073cae7ca..e1d05c0f47ebce3e6078d996f10fd4c9b06eab1f 100644 (file)
--- a/drivers/net/spider_net.h
+++ b/drivers/net/spider_net.h
@@ -487,7 +487,6 @@ struct spider_net_card {
 
        /* for ethtool */
        int msg_enable;
-       struct net_device_stats netdev_stats;
        struct spider_net_extra_stats spider_stats;
        struct spider_net_options options;
 
@@ -495,7 +494,4 @@ struct spider_net_card {
        struct spider_net_descr darray[0];
 };
 
-#define pr_err(fmt,arg...) \
-       printk(KERN_ERR fmt ,##arg)
-
 #endif