summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-12-20 15:21:46 -0500
committerJosh Boyer <jwboyer@redhat.com>2011-12-20 15:21:46 -0500
commit0e0a3afbb1f197e943dda6256a872e8d24557413 (patch)
treec84d214d0b18426f3a95360351487863f3284fc9
parentbe7f8e03bec1b0bac531d08035af78c221189e08 (diff)
downloadkernel-0e0a3afbb1f197e943dda6256a872e8d24557413.tar.gz
kernel-0e0a3afbb1f197e943dda6256a872e8d24557413.tar.xz
kernel-0e0a3afbb1f197e943dda6256a872e8d24557413.zip
Drop EDID headers patch from 751589 for now (rhbz #769103)
-rw-r--r--kernel.spec5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index ebc60de5c..b8f8622ea 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -677,7 +677,7 @@ Patch800: linux-2.6-crash-driver.patch
Patch1555: fix_xen_guest_on_old_EC2.patch
# DRM
-Patch1700: drm-edid-try-harder-to-fix-up-broken-headers.patch
+#atch1700: drm-edid-try-harder-to-fix-up-broken-headers.patch
# nouveau + drm fixes
# intel drm is all merged upstream
@@ -1366,7 +1366,7 @@ ApplyPatch linux-2.6-e1000-ich9-montevina.patch
ApplyPatch fix_xen_guest_on_old_EC2.patch
# DRM core
-ApplyPatch drm-edid-try-harder-to-fix-up-broken-headers.patch
+#ApplyPatch drm-edid-try-harder-to-fix-up-broken-headers.patch
# Nouveau DRM
@@ -2235,6 +2235,7 @@ fi
%changelog
* Tue Dec 20 2011 Josh Boyer <jwboyer@redhat.com>
- Include crtsaves.o for ppc64 as well (rhbz #769415)
+- Drop EDID headers patch from 751589 for now (rhbz #769103)
* Mon Dec 19 2011 John W. Linville <linville@redhat.com>
- modpost: add option to allow external modules to avoid taint