Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / drivers / net / irda / vlsi_ir.h

diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/net/irda/vlsi_ir.h
index 2d3b773d8e3503294010f677d33eff62e5d96a4a..ca12a60964199b162bb7b3782995156944414742 100644 (file)
--- a/drivers/net/irda/vlsi_ir.h
+++ b/drivers/net/irda/vlsi_ir.h
@@ -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;