diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 20:13:30 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 20:13:30 +0100 |
| commit | 5a84d159061d914c8dd4aa372ac6e9529c2be453 (patch) | |
| tree | 9b08af78085334af44414adafe0096276f8fe0ff /drivers/cdrom/cdrom.c | |
| parent | [ARM] Merge remaining IOP code (diff) | |
| parent | [ARM] 4165/1: S3C24XX: Select CONFIG_NO_IOPORT (diff) | |
| download | linux-5a84d159061d914c8dd4aa372ac6e9529c2be453.tar.xz linux-5a84d159061d914c8dd4aa372ac6e9529c2be453.zip | |
Merge ARM fixes
Diffstat (limited to 'drivers/cdrom/cdrom.c')
| -rw-r--r-- | drivers/cdrom/cdrom.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index 3105dddf59f1..b36f44d4d1bf 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c @@ -3553,9 +3553,7 @@ static void cdrom_sysctl_register(void) if (initialized == 1) return; - cdrom_sysctl_header = register_sysctl_table(cdrom_root_table, 1); - if (cdrom_root_table->ctl_name && cdrom_root_table->child->de) - cdrom_root_table->child->de->owner = THIS_MODULE; + cdrom_sysctl_header = register_sysctl_table(cdrom_root_table); /* set the defaults */ cdrom_sysctl_settings.autoclose = autoclose; |