diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-04-07 16:50:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-04-07 16:50:41 +0800 |
| commit | 11cbb42a86895b88ac906a6768c998f9e98a37e2 (patch) | |
| tree | 3eaeec2cff4c7e34add793c77079cdc85b058bb8 /drivers/gpu/drm/qxl/qxl_drv.h | |
| parent | 95ffb43f1ba759fb1205a8ce38a7ea5bab6be02d (diff) | |
| parent | 95bcc3e563748f65c9fc0eb1bbc3f99b76efd4b2 (diff) | |
Merge remote-tracking branch 'origin/v4.4/topic/hibernate' into hikey-mainline-rebase-4.4hikey-hibernate-v4.4
Conflicts:
arch/arm64/Makefile
arch/arm64/kernel/arm64ksyms.c
arch/arm64/kernel/asm-offsets.c
arch/arm64/kvm/hyp/fpsimd.S
drivers/firmware/psci.c
fs/proc/task_mmu.c
mm/memcontrol.c
Diffstat (limited to 'drivers/gpu/drm/qxl/qxl_drv.h')
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h index 01a86948eb8c..3ab90179e9ab 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.h +++ b/drivers/gpu/drm/qxl/qxl_drv.h @@ -135,6 +135,8 @@ struct qxl_crtc { int index; int cur_x; int cur_y; + int hot_spot_x; + int hot_spot_y; }; struct qxl_output { |