remove asm/bitops.h includes

[linux-2.6-block.git] / drivers / media / dvb / ttpci / av7110_ir.c

diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c
index a97f166bb5230e12bf5411c081aa8f9618b6ccdd..a283e1de83facf6edc5ebae02b6ae232d477b885 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/drivers/media/dvb/ttpci/av7110_ir.c
@@ -25,10 +25,9 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/proc_fs.h>
 #include <linux/kernel.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 #include "av7110.h"
 #include "av7110_hw.h"
@@ -280,7 +279,7 @@ static int av7110_ir_write_proc(struct file *file, const char __user *buffer,
        if (count < size)
                return -EINVAL;
 
-       page = (char *) vmalloc(size);
+       page = vmalloc(size);
        if (!page)
                return -ENOMEM;
 
@@ -356,7 +355,7 @@ int __devinit av7110_ir_init(struct av7110 *av7110)
                input_dev->id.vendor = av7110->dev->pci->vendor;
                input_dev->id.product = av7110->dev->pci->device;
        }
-       input_dev->cdev.dev = &av7110->dev->pci->dev;
+       input_dev->dev.parent = &av7110->dev->pci->dev;
        /* initial keymap */
        memcpy(av7110->ir.key_map, default_key_map, sizeof av7110->ir.key_map);
        input_register_keys(&av7110->ir);