diff options
author | Dave Airlie <airlied@redhat.com> | 2012-08-27 06:22:20 (GMT) |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-08-27 06:22:20 (GMT) |
commit | 93bb70e0c00f1be4cc857e4d8375c44058cce71e (patch) | |
tree | 7b6a11844e00b3f4bf8281c7a799e61494220819 /drivers/gpu/drm/udl | |
parent | 6f314ebbaa2667d67a7206ba78f28e46cf47eda5 (diff) | |
parent | c182ae42cc3611f7b3fa803c0bcab6e5d29bea63 (diff) | |
download | linux-fsl-qoriq-93bb70e0c00f1be4cc857e4d8375c44058cce71e.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
There was some merge conflicts in -next and they weren't so pretty, so
backmerge now to avoid them.
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_modes.c
Diffstat (limited to 'drivers/gpu/drm/udl')
-rw-r--r-- | drivers/gpu/drm/udl/Kconfig | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/udl/udl_modeset.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/udl/Kconfig b/drivers/gpu/drm/udl/Kconfig index 0b5e096..56e0bf3 100644 --- a/drivers/gpu/drm/udl/Kconfig +++ b/drivers/gpu/drm/udl/Kconfig @@ -1,6 +1,7 @@ config DRM_UDL tristate "DisplayLink" depends on DRM && EXPERIMENTAL + depends on USB_ARCH_HAS_HCD select DRM_USB select FB_SYS_FILLRECT select FB_SYS_COPYAREA diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c index f5dd89e..9159d48 100644 --- a/drivers/gpu/drm/udl/udl_modeset.c +++ b/drivers/gpu/drm/udl/udl_modeset.c @@ -354,8 +354,7 @@ static int udl_crtc_mode_set(struct drm_crtc *crtc, static void udl_crtc_disable(struct drm_crtc *crtc) { - - + udl_crtc_dpms(crtc, DRM_MODE_DPMS_OFF); } static void udl_crtc_destroy(struct drm_crtc *crtc) |