Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[pandora-kernel.git] / include / media / lirc_dev.h

diff --git a/include/media/lirc_dev.h b/include/media/lirc_dev.h
index b1f6066..54780a5 100644 (file)
--- a/include/media/lirc_dev.h
+++ b/include/media/lirc_dev.h
@@ -125,10 +125,10 @@ static inline unsigned int lirc_buffer_write(struct lirc_buffer *buf,
 struct lirc_driver {
        char name[40];
        int minor;
-       unsigned long code_length;
+       __u32 code_length;
        unsigned int buffer_size; /* in chunks holding one code each */
        int sample_rate;
-       unsigned long features;
+       __u32 features;
 
        unsigned int chunk_size;
 
@@ -139,7 +139,7 @@ struct lirc_driver {
        struct lirc_buffer *rbuf;
        int (*set_use_inc) (void *data);
        void (*set_use_dec) (void *data);
-       struct file_operations *fops;
+       const struct file_operations *fops;
        struct device *dev;
        struct module *owner;
 };