[PATCH]

[Bartlomiej Zolnierkiewicz]

Patch fixes ide-disk/ide-floppy/ide-probe modules interaction
with /proc fs. Last chunk is needed to compile ide-probe as
module without /proc support.

--
Bartlomiej Zolnierkiewicz
<[EMAIL PROTECTED]>

--- linux-240t10p6/drivers/ide/ide-disk.c       Thu Oct 19 22:05:01 2000
+++ linux/drivers/ide/ide-disk.c        Sat Oct 28 22:59:22 2000
@@ -891,8 +891,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-240t10p6/drivers/ide/ide-floppy.c     Tue Jun 13 20:32:00 2000
+++ linux/drivers/ide/ide-floppy.c      Sat Oct 28 22:59:51 2000
@@ -1683,8 +1683,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);
 }
--- linux-240t10p6/drivers/ide/ide-probe.c      Tue Oct  3 00:16:51 2000
+++ linux/drivers/ide/ide-probe.c       Sat Oct 28 22:58:09 2000
@@ -906,7 +906,9 @@
        for (index = 0; index < MAX_HWIFS; ++index)
                ide_unregister(index);
        ideprobe_init();
+#ifdef CONFIG_PROC_FS
        create_proc_ide_interfaces();
+#endif
        return 0;
 }