diff options
author | Daniel Vetter | 2016-10-28 09:14:08 +0200 |
---|---|---|
committer | Daniel Vetter | 2016-10-28 09:14:08 +0200 |
commit | 96583ddbec291929880edefa2141c06c63e16aa5 (patch) | |
tree | 6ae6bd3aec381d7461a687e3314bdf949798c554 /drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h | |
parent | drm/i915: Correct pipe fault reporting string (diff) | |
parent | Merge branch 'linux-4.9' of git://github.com/skeggsb/linux into drm-next (diff) | |
download | kernel-qcow2-linux-96583ddbec291929880edefa2141c06c63e16aa5.tar.gz kernel-qcow2-linux-96583ddbec291929880edefa2141c06c63e16aa5.tar.xz kernel-qcow2-linux-96583ddbec291929880edefa2141c06c63e16aa5.zip |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge latest drm-next to pull in the s/fence/dma_fence/ rework,
needed before we merge more i915 fencing patches.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h index b72c31d2f908..e90e0f6ed008 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h @@ -10,7 +10,7 @@ struct nvkm_iccsense_sensor { enum nvbios_extdev_type type; struct i2c_adapter *i2c; u8 addr; - u8 rail_mask; + u16 config; }; struct nvkm_iccsense_rail { |