diff options
| author | Chuck Ebbert <cebbert@redhat.com> | 2010-08-10 11:10:03 -0400 |
|---|---|---|
| committer | Chuck Ebbert <cebbert@redhat.com> | 2010-08-10 11:10:03 -0400 |
| commit | f2a8acbfe3a5627565ac88f4ff1c3cbe2c4e7358 (patch) | |
| tree | d05320d3a447deee907ea46e2e1cc2ccc10dba88 /drm-upgrayedd.patch | |
| parent | 60c14ff8249ad0b775410ea8d5fc962876c6328e (diff) | |
| download | dom0-kernel-f2a8acbfe3a5627565ac88f4ff1c3cbe2c4e7358.tar.gz dom0-kernel-f2a8acbfe3a5627565ac88f4ff1c3cbe2c4e7358.tar.xz dom0-kernel-f2a8acbfe3a5627565ac88f4ff1c3cbe2c4e7358.zip | |
- Bring back drm-upgrayed-fixes.patch, dropped in the
2.6.32.16 update. (#620955)
- Revert upstream DRM stable fix we already have:
drm-i915-give-up-on-8xx-lid-status.patch
Diffstat (limited to 'drm-upgrayedd.patch')
| -rw-r--r-- | drm-upgrayedd.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drm-upgrayedd.patch b/drm-upgrayedd.patch index b6bb414..752567b 100644 --- a/drm-upgrayedd.patch +++ b/drm-upgrayedd.patch @@ -11499,8 +11499,8 @@ index 0e0e4b4..b1d0acb 100644 }; @@ -622,7 +650,7 @@ static enum drm_connector_status intel_lvds_detect(struct drm_connector *connect - if (IS_I8XX(dev)) - return connector_status_connected; + { + enum drm_connector_status status = connector_status_connected; - if (!acpi_lid_open() && !dmi_check_system(bad_lid_status)) + if (!dmi_check_system(bad_lid_status) && !acpi_lid_open()) |