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 | ||||
| -rw-r--r-- | drivers/cdrom/viocd.c | 2 |
6 files changed, 2 insertions, 8 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 @@ #include <linux/module.h> #include <linux/errno.h> -#include <linux/sched.h> #include <linux/mm.h> #include <linux/timer.h> #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) 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; 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: #include <linux/errno.h> /* These include what we really need */ #include <linux/delay.h> #include <linux/string.h> -#include <linux/sched.h> #include <linux/interrupt.h> #include <linux/timer.h> #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 @@ #include <linux/slab.h> #include <linux/errno.h> #include <linux/signal.h> -#include <linux/sched.h> #include <linux/timer.h> #include <linux/fs.h> #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 @@ #include <linux/module.h> #include <linux/errno.h> -#include <linux/sched.h> #include <linux/mm.h> #include <linux/timer.h> #include <linux/fs.h> diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c index 93fbf84dcc4a..dc13ebacedfb 100644 --- a/drivers/cdrom/viocd.c +++ b/drivers/cdrom/viocd.c @@ -176,7 +176,7 @@ static int proc_viocd_open(struct inode *inode, struct file *file) return single_open(file, proc_viocd_show, NULL); } -static struct file_operations proc_viocd_operations = { +static const struct file_operations proc_viocd_operations = { .open = proc_viocd_open, .read = seq_read, .llseek = seq_lseek, |
