Merge branch 'linus' into x86/urgent

[linux-2.6-omap-h63xx.git] / drivers / net / tokenring / 3c359.h

diff --git a/drivers/net/tokenring/3c359.h b/drivers/net/tokenring/3c359.h
index b880cba0f6fd9429f4b859f9ca1f046e23c29f54..66b1ff603234774b1b4a1247af34dc4486afce9c 100644 (file)
--- a/drivers/net/tokenring/3c359.h
+++ b/drivers/net/tokenring/3c359.h
@@ -264,7 +264,7 @@ struct xl_private {
        u16 asb;
 
        u8 __iomem *xl_mmio;
-       char *xl_card_name;
+       const char *xl_card_name;
        struct pci_dev *pdev ; 
        
        spinlock_t xl_lock ; 
@@ -273,8 +273,6 @@ struct xl_private {
        struct wait_queue *srb_wait;
        volatile int asb_queued;   
 
-       struct net_device_stats xl_stats ;
-
        u16 mac_buffer ;        
        u16 xl_lan_status ;
        u8 xl_ring_speed ;