diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /include/linux/blk.h | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'include/linux/blk.h')
| -rw-r--r-- | include/linux/blk.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/blk.h b/include/linux/blk.h index d0db1bce6..594f891af 100644 --- a/include/linux/blk.h +++ b/include/linux/blk.h @@ -157,9 +157,7 @@ static void floppy_off(unsigned int nr); #elif (SCSI_DISK_MAJOR(MAJOR_NR)) #define DEVICE_NAME "scsidisk" -#define DEVICE_INTR do_sd #define TIMEOUT_VALUE (2*HZ) -#define DEVICE_REQUEST do_sd_request #define DEVICE_NR(device) (((MAJOR(device) & SD_MAJOR_MASK) << (8 - 4)) + (MINOR(device) >> 4)) #define DEVICE_ON(device) #define DEVICE_OFF(device) @@ -184,8 +182,6 @@ static void floppy_off(unsigned int nr); #elif (MAJOR_NR == SCSI_CDROM_MAJOR) #define DEVICE_NAME "CD-ROM" -#define DEVICE_INTR do_sr -#define DEVICE_REQUEST do_sr_request #define DEVICE_NR(device) (MINOR(device)) #define DEVICE_ON(device) #define DEVICE_OFF(device) @@ -387,7 +383,7 @@ static void floppy_off(unsigned int nr); #if !defined(IDE_DRIVER) #ifndef CURRENT -#define CURRENT (blk_dev[MAJOR_NR].current_request) +#define CURRENT (blk_dev[MAJOR_NR].request_queue.current_request) #endif #ifndef DEVICE_NAME @@ -421,7 +417,9 @@ else \ #endif /* DEVICE_TIMEOUT */ -static void (DEVICE_REQUEST)(void); +#ifdef DEVICE_REQUEST +static void (DEVICE_REQUEST)(request_queue_t *); +#endif #ifdef DEVICE_INTR #define CLEAR_INTR SET_INTR(NULL) |