[PATCH] simple ide without proc compile fix

Robert Love (rml@tech9.net)
05 Dec 2001 18:20:49 -0500


Attached patch is a repost now against 2.4.17-pre4.

IDE will not compile without CONFIG_PROC_FS defined. This patch fixes
that.

Yes, ifdefs in the code are not preferred. But this is merely following
the pattern in the rest of the ide*.c files (see other uses of
ide_remove_proc_entries -- just these two seem to be without ifdefs).

Please, apply.

Robert Love

--- linux-2.4.17-pre4/drivers/ide/ide-disk.c Wed Dec 5 15:16:57 2001
+++ linux/drivers/ide/ide-disk.c Wed Dec 5 18:13:35 2001
@@ -858,8 +858,10 @@
}
/* We must remove proc entries defined in this module.
Otherwise we oops while accessing these entries */
+#ifdef CONFIG_PROC_FS
if (drive->proc)
ide_remove_proc_entries(drive->proc, idedisk_proc);
+#endif
}
ide_unregister_module(&idedisk_module);
}
--- linux-2.4.17-pre4/drivers/ide/ide-floppy.c Wed Dec 5 15:16:57 2001
+++ linux/drivers/ide/ide-floppy.c Wed Dec 5 18:13:35 2001
@@ -2071,8 +2071,10 @@
}
/* We must remove proc entries defined in this module.
Otherwise we oops while accessing these entries */
+#ifdef CONFIG_PROC_FS
if (drive->proc)
ide_remove_proc_entries(drive->proc, idefloppy_proc);
+#endif
}
ide_unregister_module(&idefloppy_module);
}

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/