--- drivers/scsi/ata_piix.c.orig 2005-03-17 17:34:45.000000000 -0800 +++ drivers/scsi/ata_piix.c 2005-04-07 18:17:42.287756482 -0700 @@ -46,8 +46,8 @@ /* combined mode. if set, PATA is channel 0. * if clear, PATA is channel 1. */ - PIIX_COMB_PATA_P0 = (1 << 1), - PIIX_COMB = (1 << 2), /* combined mode enabled? */ + PIIX_COMB_PATA_P0 = (1 << 0), + PIIX_COMB = (1 << 1), /* combined mode enabled? */ PIIX_PORT_PRESENT = (1 << 0), PIIX_PORT_ENABLED = (1 << 4), --- include/linux/libata.h.orig 2005-03-17 17:33:49.000000000 -0800 +++ include/linux/libata.h 2005-04-07 22:01:39.000000000 -0700 @@ -37,8 +37,8 @@ #undef ATA_VERBOSE_DEBUG /* yet more debugging output */ #undef ATA_IRQ_TRAP /* define to ack screaming irqs */ #undef ATA_NDEBUG /* define to disable quick runtime checks */ -#undef ATA_ENABLE_ATAPI /* define to enable ATAPI support */ -#undef ATA_ENABLE_PATA /* define to enable PATA support in some +#define ATA_ENABLE_ATAPI 1 /* define to enable ATAPI support */ +#define ATA_ENABLE_PATA 1 /* define to enable PATA support in some * low-level drivers */ #undef ATAPI_ENABLE_DMADIR /* enables ATAPI DMADIR bridge support */