Merge branches 'master', 'omap1-upstream' and 'orion' into devel

[linux-2.6-omap-h63xx.git] / drivers / input / input.c

diff --git a/drivers/input/input.c b/drivers/input/input.c
index e1729e1dd9b2c567ce57f25c7880baf6f7960675..f02c242c31145483c0b1836101d0aa27d402c7b2 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -821,7 +821,7 @@ static int input_devices_seq_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static struct seq_operations input_devices_seq_ops = {
+static const struct seq_operations input_devices_seq_ops = {
        .start  = input_devices_seq_start,
        .next   = input_devices_seq_next,
        .stop   = input_devices_seq_stop,
@@ -874,7 +874,7 @@ static int input_handlers_seq_show(struct seq_file *seq, void *v)
 
        return 0;
 }
-static struct seq_operations input_handlers_seq_ops = {
+static const struct seq_operations input_handlers_seq_ops = {
        .start  = input_handlers_seq_start,
        .next   = input_handlers_seq_next,
        .stop   = input_handlers_seq_stop,
@@ -1395,9 +1395,6 @@ int input_register_device(struct input_dev *dev)
        snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id),
                 "input%ld", (unsigned long) atomic_inc_return(&input_no) - 1);
 
-       if (dev->cdev.dev)
-               dev->dev.parent = dev->cdev.dev;
-
        error = device_add(&dev->dev);
        if (error)
                return error;