diff options
Diffstat (limited to 'drivers/cdrom')
| -rw-r--r-- | drivers/cdrom/aztcd.c | 1 | ||||
| -rw-r--r-- | drivers/cdrom/cdrom.c | 4 | ||||
| -rw-r--r-- | drivers/cdrom/cm206.c | 1 | ||||
| -rw-r--r-- | drivers/cdrom/gscd.c | 1 | ||||
| -rw-r--r-- | drivers/cdrom/sjcd.c | 1 |
5 files changed, 1 insertions, 7 deletions
diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c index ec469497c10f..1f9fb7a96703 100644 --- a/drivers/cdrom/aztcd.c +++ b/drivers/cdrom/aztcd.c | |||
| @@ -170,7 +170,6 @@ | |||
| 170 | 170 | ||
| 171 | #include <linux/module.h> | 171 | #include <linux/module.h> |
| 172 | #include <linux/errno.h> | 172 | #include <linux/errno.h> |
| 173 | #include <linux/sched.h> | ||
| 174 | #include <linux/mm.h> | 173 | #include <linux/mm.h> |
| 175 | #include <linux/timer.h> | 174 | #include <linux/timer.h> |
| 176 | #include <linux/fs.h> | 175 | #include <linux/fs.h> |
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) | |||
| 3553 | if (initialized == 1) | 3553 | if (initialized == 1) |
| 3554 | return; | 3554 | return; |
| 3555 | 3555 | ||
| 3556 | cdrom_sysctl_header = register_sysctl_table(cdrom_root_table, 1); | 3556 | cdrom_sysctl_header = register_sysctl_table(cdrom_root_table); |
| 3557 | if (cdrom_root_table->ctl_name && cdrom_root_table->child->de) | ||
| 3558 | cdrom_root_table->child->de->owner = THIS_MODULE; | ||
| 3559 | 3557 | ||
| 3560 | /* set the defaults */ | 3558 | /* set the defaults */ |
| 3561 | cdrom_sysctl_settings.autoclose = autoclose; | 3559 | cdrom_sysctl_settings.autoclose = autoclose; |
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c index b6c61bbb20e1..230131163240 100644 --- a/drivers/cdrom/cm206.c +++ b/drivers/cdrom/cm206.c | |||
| @@ -183,7 +183,6 @@ History: | |||
| 183 | #include <linux/errno.h> /* These include what we really need */ | 183 | #include <linux/errno.h> /* These include what we really need */ |
| 184 | #include <linux/delay.h> | 184 | #include <linux/delay.h> |
| 185 | #include <linux/string.h> | 185 | #include <linux/string.h> |
| 186 | #include <linux/sched.h> | ||
| 187 | #include <linux/interrupt.h> | 186 | #include <linux/interrupt.h> |
| 188 | #include <linux/timer.h> | 187 | #include <linux/timer.h> |
| 189 | #include <linux/cdrom.h> | 188 | #include <linux/cdrom.h> |
diff --git a/drivers/cdrom/gscd.c b/drivers/cdrom/gscd.c index fa7082489765..b3ab6e9b8df1 100644 --- a/drivers/cdrom/gscd.c +++ b/drivers/cdrom/gscd.c | |||
| @@ -53,7 +53,6 @@ | |||
| 53 | #include <linux/slab.h> | 53 | #include <linux/slab.h> |
| 54 | #include <linux/errno.h> | 54 | #include <linux/errno.h> |
| 55 | #include <linux/signal.h> | 55 | #include <linux/signal.h> |
| 56 | #include <linux/sched.h> | ||
| 57 | #include <linux/timer.h> | 56 | #include <linux/timer.h> |
| 58 | #include <linux/fs.h> | 57 | #include <linux/fs.h> |
| 59 | #include <linux/mm.h> | 58 | #include <linux/mm.h> |
diff --git a/drivers/cdrom/sjcd.c b/drivers/cdrom/sjcd.c index bf5aef4e555b..5409fca5bbfc 100644 --- a/drivers/cdrom/sjcd.c +++ b/drivers/cdrom/sjcd.c | |||
| @@ -60,7 +60,6 @@ | |||
| 60 | 60 | ||
| 61 | #include <linux/module.h> | 61 | #include <linux/module.h> |
| 62 | #include <linux/errno.h> | 62 | #include <linux/errno.h> |
| 63 | #include <linux/sched.h> | ||
| 64 | #include <linux/mm.h> | 63 | #include <linux/mm.h> |
| 65 | #include <linux/timer.h> | 64 | #include <linux/timer.h> |
| 66 | #include <linux/fs.h> | 65 | #include <linux/fs.h> |