Merge https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs

[cascardo/linux.git] / drivers / net / irda / vlsi_ir.h

diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/net/irda/vlsi_ir.h
index f9119c6..f9db2ce 100644 (file)
--- a/drivers/net/irda/vlsi_ir.h
+++ b/drivers/net/irda/vlsi_ir.h
@@ -723,7 +723,7 @@ typedef struct vlsi_irda_dev {
        void                    *virtaddr;
        struct vlsi_ring        *tx_ring, *rx_ring;
 
-       struct timeval          last_rx;
+       ktime_t                 last_rx;
 
        spinlock_t              lock;
        struct mutex            mtx;