diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.61/drivers/ide/ide-cd.c linux-2.5.61-ac2/drivers/ide/ide-cd.c
--- linux-2.5.61/drivers/ide/ide-cd.c 2003-02-10 18:38:30.000000000 +0000
+++ linux-2.5.61-ac2/drivers/ide/ide-cd.c 2003-02-18 18:06:17.000000000 +0000
@@ -1276,9 +1274,7 @@
* this condition is far too common, to bother
* users about it
*/
-#if 0
- printk("%s: disabled DSC seek overlap\n", drive->name);
-#endif
+ /* printk("%s: disabled DSC seek overlap\n", drive->name);*/
drive->dsc_overlap = 0;
}
}
@@ -2965,8 +2961,10 @@
printk(", %dkB Cache", be16_to_cpu(cap.buffer_size));
+#ifdef CONFIG_BLK_DEV_IDEDMA
if (drive->using_dma)
(void) HWIF(drive)->ide_dma_verbose(drive);
+#endif /* CONFIG_BLK_DEV_IDEDMA */
printk("\n");
return nslots;
@@ -3261,11 +3259,7 @@
.version = IDECD_VERSION,
.media = ide_cdrom,
.busy = 0,
-#ifdef CONFIG_IDEDMA_ONLYDISK
- .supports_dma = 0,
-#else
.supports_dma = 1,
-#endif
.supports_dsc_overlap = 1,
.cleanup = ide_cdrom_cleanup,
.do_request = ide_do_rw_cdrom,
-
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/
This archive was generated by hypermail 2b29 : Sun Feb 23 2003 - 22:00:22 EST