diff -urN linux-2.4.23-pre3-pac2/drivers/scsi/Config.in linux-2.4.23-pre3-pac3/drivers/scsi/Config.in
--- linux-2.4.23-pre3-pac2/drivers/scsi/Config.in	2003-09-13 02:35:08.000000000 +0200
+++ linux-2.4.23-pre3-pac3/drivers/scsi/Config.in	2003-09-13 02:41:35.000000000 +0200
@@ -71,7 +71,7 @@
    dep_tristate 'AMI MegaRAID support (new driver)' CONFIG_SCSI_MEGARAID2 $CONFIG_SCSI
 fi
 
-dep_bool 'SATA support' CONFIG_SCSI_ATA $CONFIG_SCSI
+dep_tristate 'SATA support' CONFIG_SCSI_ATA $CONFIG_SCSI
 #dep_bool '  Parallel ATA support' CONFIG_SCSI_ATA_PATA $CONFIG_SCSI_ATA
 dep_tristate '  Intel PIIX/ICH support' CONFIG_SCSI_ATA_PIIX $CONFIG_SCSI_ATA $CONFIG_PCI
 dep_tristate '  VIA SATA support' CONFIG_SCSI_SATA_VIA $CONFIG_SCSI_ATA $CONFIG_PCI
diff -urN linux-2.4.23-pre3-pac2/include/linux/ata.h linux-2.4.23-pre3-pac3/include/linux/ata.h
--- linux-2.4.23-pre3-pac2/include/linux/ata.h	2003-09-13 02:35:11.000000000 +0200
+++ linux-2.4.23-pre3-pac3/include/linux/ata.h	2003-09-13 02:41:51.000000000 +0200
@@ -629,13 +629,6 @@
 	return status;
 }
 
-/*
- * 2.5 compat.
- */
-
-typedef void irqreturn_t;
-#define IRQ_RETVAL(x)	/* nothing */
-
 #define REPORT_LUNS		0xa0
 #define READ_16			0x88
 #define WRITE_16		0x8a