cdrom: handle SYSCTL without PROC_FS

PATCH New Randy.Dunlap 1 participant 1 message Nov 17, 2004 Uniform cdrom driver

lore

Share & tools

lore

Randy.Dunlap

author

2004-11-17 23:46 UTC #0 lore raw

PATCH 1/1 cdrom: handle SYSCTL without PROC_FS

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 <[email protected]>

drivers/cdrom/cdrom.c renamed from drivers/cdrom/cdrom.c~cdrom_sysctl +0 -2

diff -Naurp ./drivers/cdrom/cdrom.c~cdrom_sysctl ./drivers/cdrom/cdrom.c
@@ -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;