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 2d3b773d8e3503294010f677d33eff62e5d96a4a..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 */
@@ -728,7 +728,7 @@ typedef struct vlsi_irda_dev {
        struct timeval          last_rx;
 
        spinlock_t              lock;
-       struct semaphore        sem;
+       struct mutex            mtx;
 
        u8                      resume_ok;      
        struct proc_dir_entry   *proc_entry;