ath9k_hw: rename the PA calib routines to match their families

[safe/jmp/linux-2.6] / drivers / net / tokenring / olympic.h

diff --git a/drivers/net/tokenring/olympic.h b/drivers/net/tokenring/olympic.h
index c919563..30631ba 100644 (file)
--- a/drivers/net/tokenring/olympic.h
+++ b/drivers/net/tokenring/olympic.h
@@ -254,7 +254,7 @@ struct olympic_private {
        u8 __iomem *olympic_mmio;
        u8 __iomem *olympic_lap;
        struct pci_dev *pdev ; 
-       char *olympic_card_name ; 
+       const char *olympic_card_name;
 
        spinlock_t olympic_lock ; 
 
@@ -275,7 +275,6 @@ struct olympic_private {
        struct sk_buff *tx_ring_skb[OLYMPIC_TX_RING_SIZE], *rx_ring_skb[OLYMPIC_RX_RING_SIZE];  
        int tx_ring_free, tx_ring_last_status, rx_ring_last_received,rx_status_last_received, free_tx_ring_entries;
 
-       struct net_device_stats olympic_stats ;
        u16 olympic_lan_status ;
        u8 olympic_ring_speed ;
        u16 pkt_buf_sz ;