diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-01-27 09:48:08 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-01-27 09:48:08 +1000 |
| commit | 22cbbceff65cb03ee37495b52f360809fa439293 (patch) | |
| tree | 59ee71a72328743242a2357b0a0af8697d1640e4 /drivers/block | |
| parent | 104b61590dcd5f71ff518e2b820e1cdf9d0350f2 (diff) | |
| parent | 26bc420b59a38e4e6685a73345a0def461136dce (diff) | |
Merge tag 'v3.19-rc6' into drm-fixes
Linux 3.19-rc6
pull in rc6 as the amdkfd fixes are based on it, and I'd rather
be doing the merges separately
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/nvme-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index cb529e9a82dd..d826bf3e62c8 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -106,7 +106,7 @@ struct nvme_queue { dma_addr_t cq_dma_addr; u32 __iomem *q_db; u16 q_depth; - u16 cq_vector; + s16 cq_vector; u16 sq_head; u16 sq_tail; u16 cq_head; |