diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-31 15:14:10 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-31 15:14:18 -0400 |
| commit | c32f38619af6302da58835fb292b159bdd96d11f (patch) | |
| tree | a5bb4a9c51999557eaa919f27369c70811cd813c /drivers/gpu/drm/udl/udl_modeset.c | |
| parent | 761743ebc92df72053e736fce953a5d2e90099d5 (diff) | |
| parent | 0dcd5052c8543ef999bcd252cee50b7ae8111e89 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge the 'net' tree to get the recent set of netfilter bug fixes in
order to assist with some merge hassles Pablo is going to have to deal
with for upcoming changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpu/drm/udl/udl_modeset.c')
| -rw-r--r-- | drivers/gpu/drm/udl/udl_modeset.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c index f5dd89e891de..9159d48d1dfd 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, | |||
| 354 | 354 | ||
| 355 | static void udl_crtc_disable(struct drm_crtc *crtc) | 355 | static void udl_crtc_disable(struct drm_crtc *crtc) |
| 356 | { | 356 | { |
| 357 | 357 | udl_crtc_dpms(crtc, DRM_MODE_DPMS_OFF); | |
| 358 | |||
| 359 | } | 358 | } |
| 360 | 359 | ||
| 361 | static void udl_crtc_destroy(struct drm_crtc *crtc) | 360 | static void udl_crtc_destroy(struct drm_crtc *crtc) |