Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/net/irda/vlsi_ir.h
index ca12a60964199b162bb7b3782995156944414742..c8b9c74eea524249c443a1e1faa28865ccd5e81d 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 */