summaryrefslogtreecommitdiff
path: root/drivers/scsi/ipr.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2015-11-10 16:56:14 +0300
committerChristoph Hellwig <hch@lst.de>2015-12-11 22:52:24 +0300
commit511cbce2ff8b9d322077909ee90c5d4b67b29b75 (patch)
tree27e1f9e09332d204ec1a1a506e674ca80ed9e580 /drivers/scsi/ipr.h
parenta2dbb7b56f2c29fc78b18a3fbe47ad80f6912092 (diff)
downloadlinux-511cbce2ff8b9d322077909ee90c5d4b67b29b75.tar.xz
irq_poll: make blk-iopoll available outside the block layer
The new name is irq_poll as iopoll is already taken. Better suggestions welcome. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Diffstat (limited to 'drivers/scsi/ipr.h')
-rw-r--r--drivers/scsi/ipr.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index a34c7a5a995e..56c57068300a 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -32,7 +32,7 @@
#include <linux/libata.h>
#include <linux/list.h>
#include <linux/kref.h>
-#include <linux/blk-iopoll.h>
+#include <linux/irq_poll.h>
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
@@ -517,7 +517,7 @@ struct ipr_hrr_queue {
u8 allow_cmds:1;
u8 removing_ioa:1;
- struct blk_iopoll iopoll;
+ struct irq_poll iopoll;
};
/* Command packet structure */