patch-2.1.119 linux/drivers/block/ide.c

• Lines: 23
• Date: Thu Aug 27 11:03:56 1998
• Orig file: v2.1.118/linux/drivers/block/ide.c
• Orig date: Wed Aug 26 11:37:35 1998

diff -u --recursive --new-file v2.1.118/linux/drivers/block/ide.c linux/drivers/block/ide.c
@@ -1104,8 +1104,7 @@
 			if (sleep) {
 				if (0 < (signed long)(jiffies + WAIT_MIN_SLEEP - sleep)) 
 					sleep = jiffies + WAIT_MIN_SLEEP;
-				hwgroup->timer.expires = sleep;
-				add_timer(&hwgroup->timer);
+				mod_timer(&hwgroup->timer, sleep);
 			} else {
 				/* Ugly, but how can we sleep for the lock otherwise? perhaps from tq_scheduler? */
 				ide_release_lock(&ide_lock);	/* for atari only */
@@ -2638,6 +2637,12 @@
 		(void) init_pdc4030();
 	}
 #endif /* CONFIG_BLK_DEV_PDC4030 */
+#ifdef CONFIG_BLK_DEV_IDE_PMAC
+	{
+		extern void pmac_ide_probe(void);
+		pmac_ide_probe();
+	}
+#endif /* CONFIG_BLK_DEV_IDE_PMAC */
 }
 
 __initfunc(void ide_init_builtin_drivers (void))