[PATCH] cdrom: handle SYSCTL without PROC_FS

From: Randy.Dunlap
Date: Wed Nov 17 2004 - 18:48:49 EST



Fixes oops (reference to cdrom_root_table->child->)
when CONFIG_SYSCTL=y and CONFIG_PROC_FS=n.

diffstat:=
drivers/cdrom/cdrom.c | 2 --
1 files changed, 2 deletions(-)

Signed-off-by: Randy Dunlap <rddunlap@xxxxxxxx>
--
diff -Naurp ./drivers/cdrom/cdrom.c~cdrom_sysctl ./drivers/cdrom/cdrom.c
--- ./drivers/cdrom/cdrom.c~cdrom_sysctl 2004-11-16 13:33:30.177562576 -0800
+++ ./drivers/cdrom/cdrom.c 2004-11-17 13:23:54.831232024 -0800
@@ -3336,7 +3336,6 @@ ctl_table cdrom_cdrom_table[] = {

/* Make sure that /proc/sys/dev is there */
ctl_table cdrom_root_table[] = {
-#ifdef CONFIG_PROC_FS
{
.ctl_name = CTL_DEV,
.procname = "dev",
@@ -3344,7 +3343,6 @@ ctl_table cdrom_root_table[] = {
.mode = 0555,
.child = cdrom_cdrom_table,
},
-#endif /* CONFIG_PROC_FS */
{ .ctl_name = 0 }
};
static struct ctl_table_header *cdrom_sysctl_header;