diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-16 15:42:14 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-16 15:42:14 +1100 |
| commit | 17929b80a92731ac8b3c5fdb55f582c8caa96642 (patch) | |
| tree | 129626dceb9cd5f14a38d5a330ef1dd7ec15bc03 /drivers/input | |
| parent | f709388a6687b2e12c4a0f0d2c74ae2366f6c7b7 (diff) | |
| parent | 8e72f928ffb12ae440ba7d28df326f7e62f934b9 (diff) | |
Merge commit 'proc/proc'
Conflicts:
security/selinux/hooks.c
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/input.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index 46e9ce195064..994696623789 100644 --- 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) |