ath5k: Misc hw_attach fixes

[linux-2.6] / drivers / net / irda / vlsi_ir.h

diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/net/irda/vlsi_ir.h
index ca12a60964199b162bb7b3782995156944414742..9b1884329fba39cf1001f63488b0ff17b5fbaee0 100644 (file)
--- a/drivers/net/irda/vlsi_ir.h
+++ b/drivers/net/irda/vlsi_ir.h
@@ -537,10 +537,10 @@ calc_width_bits(unsigned baudrate, unsigned widthselect, unsigned clockselect)
  */
 
 struct ring_descr_hw {
-       volatile u16    rd_count;       /* tx/rx count [11:0] */
-       u16             reserved;
+       volatile __le16 rd_count;       /* tx/rx count [11:0] */
+       __le16          reserved;
        union {
-               u32     addr;           /* [23:0] of the buffer's busaddress */
+               __le32  addr;           /* [23:0] of the buffer's busaddress */
                struct {
                        u8              addr_res[3];
                        volatile u8     status;         /* descriptor status */
@@ -617,7 +617,7 @@ static inline void rd_set_addr_status(struct ring_descr *rd, dma_addr_t a, u8 s)
         */
 
        if ((a & ~DMA_MASK_MSTRPAGE)>>24 != MSTRPAGE_VALUE) {
-               IRDA_ERROR("%s: pci busaddr inconsistency!\n", __FUNCTION__);
+               IRDA_ERROR("%s: pci busaddr inconsistency!\n", __func__);
                dump_stack();
                return;
        }