Merge commit 'v2.6.26-rc9' into cpus4096

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

diff --git a/drivers/net/tokenring/olympic.h b/drivers/net/tokenring/olympic.h
index 2fc59c9974681de7845613e633ba6d9a8f2dc552..10fbba08978f4592666d92c6f4f55369589de825 100644 (file)
--- a/drivers/net/tokenring/olympic.h
+++ b/drivers/net/tokenring/olympic.h
@@ -216,31 +216,31 @@
 /* xxxx These structures are all little endian in hardware. */
 
 struct olympic_tx_desc {
-       u32 buffer;
-       u32 status_length;
+       __le32 buffer;
+       __le32 status_length;
 };
 
 struct olympic_tx_status {
-       u32 status;
+       __le32 status;
 };
 
 struct olympic_rx_desc {
-       u32 buffer;
-       u32 res_length; 
+       __le32 buffer;
+       __le32 res_length; 
 };
 
 struct olympic_rx_status {
-       u32 fragmentcnt_framelen;
-       u32 status_buffercnt;
+       __le32 fragmentcnt_framelen;
+       __le32 status_buffercnt;
 };
 /* xxxx END These structures are all little endian in hardware. */
 /* xxxx There may be more, but I'm pretty sure about these */
 
 struct mac_receive_buffer {
-       u16 next ; 
+       __le16 next ; 
        u8 padding ; 
        u8 frame_status ;
-       u16 buffer_length ; 
+       __le16 buffer_length ; 
        u8 frame_data ; 
 };
 
@@ -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 ;