[arch-commits] Commit in linux/trunk (2 files)

[Ionut Biru]

    Date: Monday, June 25, 2012 @ 22:10:30
  Author: ibiru
Revision: 162367

drop workaround
the real fix is being queued for the next 3.4 version

Modified:
  linux/trunk/PKGBUILD
Deleted:
  linux/trunk/3.4.4-fix-gtx560ti-nouveau-regression.patch

---------------------------------------------+
 3.4.4-fix-gtx560ti-nouveau-regression.patch |   20 --------------------
 PKGBUILD                                    |   10 ++--------
 2 files changed, 2 insertions(+), 28 deletions(-)

Deleted: 3.4.4-fix-gtx560ti-nouveau-regression.patch
===================================================================
--- 3.4.4-fix-gtx560ti-nouveau-regression.patch	2012-06-26 01:03:29 UTC (rev 162366)
+++ 3.4.4-fix-gtx560ti-nouveau-regression.patch	2012-06-26 02:10:30 UTC (rev 162367)
@@ -1,20 +0,0 @@
-Revert change to include/drm/drm_fb_helper.h made in commit 4f988d132d2668b4f3b42bfc70daa531115ccca1
-
- include/drm/drm_fb_helper.h     |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
-index 55e10d6..5120b01 100644
---- a/include/drm/drm_fb_helper.h
-+++ b/include/drm/drm_fb_helper.h
-@@ -35,6 +35,7 @@ struct drm_fb_helper;
- #include <linux/kgdb.h>
- 
- struct drm_fb_helper_crtc {
-+	uint32_t crtc_id;
- 	struct drm_mode_set mode_set;
- 	struct drm_display_mode *desired_mode;
- };
--- 
-1.7.6.5
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-26 01:03:29 UTC (rev 162366)
+++ PKGBUILD	2012-06-26 02:10:30 UTC (rev 162367)
@@ -23,8 +23,7 @@
         'fix-acerhdf-1810T-bios.patch'
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
-        '3.4.4-fix-backlight-regression.patch'
-        '3.4.4-fix-gtx560ti-nouveau-regression.patch')
+	'3.4.4-fix-backlight-regression.patch')
 md5sums=('967f72983655e2479f951195953e8480'
          '58e6672d932d74d5e2b6811b9d37d67c'
          '3f2c307c8ffae67f60c13ef69af8364a'
@@ -33,8 +32,7 @@
          '38c1fd4a1f303f1f6c38e7f082727e2f'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
-         '80a46681386bb87813989faeb92bdd9a'
-         '827ffd855dc8b0c91577545c5804c19f')
+	 '80a46681386bb87813989faeb92bdd9a')
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
@@ -58,10 +56,6 @@
   # https://bugzilla.kernel.org/show_bug.cgi?id=43168
   patch -Np1 -i "${srcdir}/3.4.4-fix-backlight-regression.patch"
 
-  # fix nouveau regression
-  # Arch Linux bug report: FS#30417
-  patch -Np1 -i "${srcdir}/3.4.4-fix-gtx560ti-nouveau-regression.patch"
-
   # Patch submitted upstream, waiting for inclusion:
   # https://lkml.org/lkml/2012/2/19/51
   # add support for latest bios of Acer 1810T acerhdf module