Merge branch 'next' into for-linus

[mv-sheeva.git] / drivers / input / input.c

diff --git a/drivers/input/input.c b/drivers/input/input.c
index a79c83397a9c16f2450fb3fe3641506191d897d8..935a1835de2d3b854423d90a2af4f6ffeec9ca81 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -910,8 +910,6 @@ static int __init input_proc_init(void)
        if (!proc_bus_input_dir)
                return -ENOMEM;
 
-       proc_bus_input_dir->owner = THIS_MODULE;
-
        entry = proc_create("devices", 0, proc_bus_input_dir,
                            &input_devices_fileops);
        if (!entry)