diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-14 02:19:22 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-14 02:19:22 +0200 |
| commit | 8b6ee04067310a6397476f05f06e52dabd8b0bb6 (patch) | |
| tree | 022a153b777a9e38f49d46e4fb8f1e6747d4a5f4 /drivers/scsi/scsi_lib.c | |
| parent | Merge remote-tracking branch 'jwb/next' into next (diff) | |
| parent | powerpc/irq: Fix another case of lazy IRQ state getting out of sync (diff) | |
| download | linux-8b6ee04067310a6397476f05f06e52dabd8b0bb6.tar.xz linux-8b6ee04067310a6397476f05f06e52dabd8b0bb6.zip | |
Merge branch 'merge' into next
We want the irq fixes from the "merge" branch.
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index ead6405f3e51..5dfd7495d1a1 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1638,7 +1638,7 @@ struct request_queue *__scsi_alloc_queue(struct Scsi_Host *shost, request_fn_proc *request_fn) { struct request_queue *q; - struct device *dev = shost->shost_gendev.parent; + struct device *dev = shost->dma_dev; q = blk_init_queue(request_fn, NULL); if (!q) |