diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-03 15:52:27 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-03 15:52:27 -0500 |
| commit | 9633911b5635f00cb29de62348f874aaaa05274e (patch) | |
| tree | 20a2a7a645e3cd7cae8e65481d7900c0cd2da10a /drm-i915-hush-check-crtc-state.patch | |
| parent | 8ea4731c3887934a789f852eb7fde9a5b50f36d5 (diff) | |
| download | kernel-9633911b5635f00cb29de62348f874aaaa05274e.tar.gz kernel-9633911b5635f00cb29de62348f874aaaa05274e.tar.xz kernel-9633911b5635f00cb29de62348f874aaaa05274e.zip | |
Linux v4.0-rc2
- Enable CONFIG_CM32181 for ALS on Carbon X1
- Disable debugging options.
Diffstat (limited to 'drm-i915-hush-check-crtc-state.patch')
| -rw-r--r-- | drm-i915-hush-check-crtc-state.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drm-i915-hush-check-crtc-state.patch b/drm-i915-hush-check-crtc-state.patch index 1bdf89484..0c19b53bc 100644 --- a/drm-i915-hush-check-crtc-state.patch +++ b/drm-i915-hush-check-crtc-state.patch @@ -14,10 +14,10 @@ Upstream-status: http://lists.freedesktop.org/archives/intel-gfx/2013-November/0 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c -index 3117679299a6..ff781dc0535a 100644 +index e730789b53b7..74b3f14327cc 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c -@@ -10885,7 +10885,7 @@ check_crtc_state(struct drm_device *dev) +@@ -10886,7 +10886,7 @@ check_crtc_state(struct drm_device *dev) if (active && !intel_pipe_config_compare(dev, crtc->config, &pipe_config)) { |