Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / staging / lirc / lirc_ite8709.c

diff --git a/drivers/staging/lirc/lirc_ite8709.c b/drivers/staging/lirc/lirc_ite8709.c
index 9352f45bbecef8e05db3e3e5de2354218bb71544..cb20cfdcfaddf22a479167c6fff6c81f5ca71ea4 100644 (file)
--- a/drivers/staging/lirc/lirc_ite8709.c
+++ b/drivers/staging/lirc/lirc_ite8709.c
@@ -102,8 +102,8 @@ struct ite8709_device {
        int io;
        int irq;
        spinlock_t hardware_lock;
-       unsigned long long acc_pulse;
-       unsigned long long acc_space;
+       __u64 acc_pulse;
+       __u64 acc_space;
        char lastbit;
        struct timeval last_tv;
        struct lirc_driver driver;
@@ -220,7 +220,7 @@ static void ite8709_set_use_dec(void *data)
 }
 
 static void ite8709_add_read_queue(struct ite8709_device *dev, int flag,
-                                       unsigned long long val)
+                                  __u64 val)
 {
        int value;