patch-2.4.0-test12 linux/drivers/ide/ide.c

Next file: linux/drivers/ide/q40ide.c
Previous file: linux/drivers/ide/ide-cd.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test11/linux/drivers/ide/ide.c linux/drivers/ide/ide.c
@@ -1324,7 +1324,7 @@
 				mod_timer(&hwgroup->timer, sleep);
 				/* we purposely leave hwgroup->busy==1 while sleeping */
 			} else {
-				/* Ugly, but how can we sleep for the lock otherwise? perhaps from tq_scheduler? */
+				/* Ugly, but how can we sleep for the lock otherwise? perhaps from tq_disk? */
 				ide_release_lock(&ide_lock);	/* for atari only */
 				hwgroup->busy = 0;
 			}
@@ -3241,6 +3241,12 @@
 		macide_init();
 	}
 #endif /* CONFIG_BLK_DEV_MAC_IDE */
+#ifdef CONFIG_BLK_DEV_Q40IDE
+	{
+		extern void q40ide_init(void);
+		q40ide_init();
+	}
+#endif /* CONFIG_BLK_DEV_Q40IDE */
 #ifdef CONFIG_BLK_DEV_BUDDHA
 	{
 		extern void buddha_init(void);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)