--- linux/drivers/ide/via82cxxx.c.orig	Thu Dec 19 08:35:20 2002
+++ linux/drivers/ide/via82cxxx.c	Thu Dec 19 08:43:10 2002
@@ -1,5 +1,5 @@
 /*
- * Version 3.35
+ * Version 3.36jreiser
  *
  * VIA IDE driver for Linux. Supported southbridges:
  *
@@ -129,7 +129,7 @@
 
 	via_print("----------VIA BusMastering IDE Configuration----------------");
 
-	via_print("Driver Version:                     3.35");
+	via_print("Driver Version:                     3.36jreiser");
 	via_print("South Bridge:                       VIA %s", via_config->name);
 
 	pci_read_config_byte(isa_dev, PCI_REVISION_ID, &t);
@@ -295,6 +295,10 @@
 		ide_timing_merge(&p, &t, &t, IDE_TIMING_8BIT);
 	}
 
+	/* Always use 4 address setup clocks on ATAPI devices */
+	if (drive->media != ide_disk)
+		t.setup = 4;
+ 
 	via_set_speed(HWIF(drive)->pci_dev, drive->dn, &t);
 
 	if (!drive->init_speed)