diff options
Diffstat (limited to 'drivers/block/cpqarray.c')
| -rw-r--r-- | drivers/block/cpqarray.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c index b94cd1c32131..be4e3477d83b 100644 --- a/drivers/block/cpqarray.c +++ b/drivers/block/cpqarray.c | |||
| @@ -161,7 +161,7 @@ static int ida_ioctl(struct inode *inode, struct file *filep, unsigned int cmd, | |||
| 161 | static int ida_getgeo(struct block_device *bdev, struct hd_geometry *geo); | 161 | static int ida_getgeo(struct block_device *bdev, struct hd_geometry *geo); |
| 162 | static int ida_ctlr_ioctl(ctlr_info_t *h, int dsk, ida_ioctl_t *io); | 162 | static int ida_ctlr_ioctl(ctlr_info_t *h, int dsk, ida_ioctl_t *io); |
| 163 | 163 | ||
| 164 | static void do_ida_request(request_queue_t *q); | 164 | static void do_ida_request(struct request_queue *q); |
| 165 | static void start_io(ctlr_info_t *h); | 165 | static void start_io(ctlr_info_t *h); |
| 166 | 166 | ||
| 167 | static inline void addQ(cmdlist_t **Qptr, cmdlist_t *c); | 167 | static inline void addQ(cmdlist_t **Qptr, cmdlist_t *c); |
| @@ -391,7 +391,7 @@ static void __devexit cpqarray_remove_one_eisa (int i) | |||
| 391 | /* pdev is NULL for eisa */ | 391 | /* pdev is NULL for eisa */ |
| 392 | static int __init cpqarray_register_ctlr( int i, struct pci_dev *pdev) | 392 | static int __init cpqarray_register_ctlr( int i, struct pci_dev *pdev) |
| 393 | { | 393 | { |
| 394 | request_queue_t *q; | 394 | struct request_queue *q; |
| 395 | int j; | 395 | int j; |
| 396 | 396 | ||
| 397 | /* | 397 | /* |
| @@ -886,7 +886,7 @@ static inline cmdlist_t *removeQ(cmdlist_t **Qptr, cmdlist_t *c) | |||
| 886 | * are in here (either via the dummy do_ida_request functions or by being | 886 | * are in here (either via the dummy do_ida_request functions or by being |
| 887 | * called from the interrupt handler | 887 | * called from the interrupt handler |
| 888 | */ | 888 | */ |
| 889 | static void do_ida_request(request_queue_t *q) | 889 | static void do_ida_request(struct request_queue *q) |
| 890 | { | 890 | { |
| 891 | ctlr_info_t *h = q->queuedata; | 891 | ctlr_info_t *h = q->queuedata; |
| 892 | cmdlist_t *c; | 892 | cmdlist_t *c; |
