diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
tree | e2be02f33984c48ec019c654051d27964e42c441 /drivers/scsi/eata.h | |
parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) |
Merge with 2.3.19.
Diffstat (limited to 'drivers/scsi/eata.h')
-rw-r--r-- | drivers/scsi/eata.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/drivers/scsi/eata.h b/drivers/scsi/eata.h index f1641f42d..6c00ca0a2 100644 --- a/drivers/scsi/eata.h +++ b/drivers/scsi/eata.h @@ -16,12 +16,10 @@ int eata2x_reset(Scsi_Cmnd *); int eata2x_old_reset(Scsi_Cmnd *, unsigned int); int eata2x_biosparam(Disk *, kdev_t, int *); -#define EATA_VERSION "4.33.00" +#define EATA_VERSION "5.11.00" #define LinuxVersionCode(v, p, s) (((v)<<16)+((p)<<8)+(s)) -#if LINUX_VERSION_CODE >= LinuxVersionCode(2,1,101) - #define EATA { \ name: "EATA/DMA 2.0x rev. " EATA_VERSION " ", \ detect: eata2x_detect, \ @@ -40,21 +38,4 @@ int eata2x_biosparam(Disk *, kdev_t, int *); use_new_eh_code: 1 /* Enable new error code */ \ } -#else /* Use old scsi code */ - -#define EATA { \ - name: "EATA/DMA 2.0x rev. " EATA_VERSION " ", \ - detect: eata2x_detect, \ - release: eata2x_release, \ - queuecommand: eata2x_queuecommand, \ - abort: eata2x_old_abort, \ - reset: eata2x_old_reset, \ - bios_param: eata2x_biosparam, \ - this_id: 7, \ - unchecked_isa_dma: 1, \ - use_clustering: ENABLE_CLUSTERING \ - } - -#endif - #endif |