diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-08 07:03:55 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-08 07:03:55 +1000 |
| commit | f84676185368e36c6bc0eeab87ab73ed39042648 (patch) | |
| tree | 7d97885644c7b6a09c244de11af94409da665e62 /drivers/gpu/drm/drm_crtc_helper.c | |
| parent | 22dd50133ab7548adb23e86c302d6e8b75817e8c (diff) | |
| parent | 447aeb907e417e0e837b4a4026d5081c88b6e8ca (diff) | |
Merge remote branch 'origin/drm-core-next' into test
Conflicts:
drivers/gpu/drm/drm_fb_helper.c
Diffstat (limited to 'drivers/gpu/drm/drm_crtc_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_crtc_helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index bbfd110a716..3963b3c1081 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -109,7 +109,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, count = (*connector_funcs->get_modes)(connector); if (!count) { - count = drm_add_modes_noedid(connector, 800, 600); + count = drm_add_modes_noedid(connector, 1024, 768); if (!count) return 0; } |