patch-2.1.92 linux/drivers/block/ide-floppy.c

Next file: linux/drivers/block/ide-pci.c
Previous file: linux/drivers/block/ide-disk.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.91/linux/drivers/block/ide-floppy.c linux/drivers/block/ide-floppy.c
@@ -1379,10 +1379,18 @@
 	return 0;
 }
 
+#ifdef CONFIG_PROC_FS
+
 static ide_proc_entry_t idefloppy_proc[] = {
-	{ "geometry", proc_ide_read_geometry, NULL },
-	{ NULL, NULL, NULL }
+	{ "geometry",	S_IFREG|S_IRUGO,	proc_ide_read_geometry,	NULL },
+	{ NULL, 0, NULL, NULL }
 };
+
+#else
+
+#define	idefloppy_proc	NULL
+
+#endif	/* CONFIG_PROC_FS */
 
 /*
  *	IDE subdriver functions, registered with ide.c

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov