patch-2.4.25 linux-2.4.25/drivers/ide/ide.c
Next file: linux-2.4.25/drivers/ide/legacy/buddha.c
Previous file: linux-2.4.25/drivers/ide/ide-proc.c
Back to the patch index
Back to the overall index
- Lines: 26
- Date:
2004-02-18 05:36:31.000000000 -0800
- Orig file:
linux-2.4.24/drivers/ide/ide.c
- Orig date:
2003-11-28 10:26:20.000000000 -0800
diff -urN linux-2.4.24/drivers/ide/ide.c linux-2.4.25/drivers/ide/ide.c
@@ -2548,6 +2548,12 @@
macide_init();
}
#endif /* CONFIG_BLK_DEV_MAC_IDE */
+#ifdef CONFIG_BLK_DEV_CPCI405_IDE
+ {
+ extern void cpci405ide_init(void);
+ cpci405ide_init();
+ }
+#endif /* CONFIG_BLK_DEV_CPCI405_IDE */
#ifdef CONFIG_BLK_DEV_Q40IDE
{
extern void q40ide_init(void);
@@ -2850,8 +2856,10 @@
drive->revalidate = 1;
drive->suspend_reset = 0;
#ifdef CONFIG_PROC_FS
- ide_add_proc_entries(drive->proc, generic_subdriver_entries, drive);
- ide_add_proc_entries(drive->proc, driver->proc, drive);
+ if (drive->driver != &idedefault_driver) {
+ ide_add_proc_entries(drive->proc, generic_subdriver_entries, drive);
+ ide_add_proc_entries(drive->proc, driver->proc, drive);
+ }
#endif
return 0;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)