[gentoo-commits] linux-patches r1730 - genpatches-2.6/trunk/2.6.34

[gentoo-commits] linux-patches r1730 - genpatches-2.6/trunk/2.6.34

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2010-08-02 19:03:15 +0000 (Mon, 02 Aug 2010)
New Revision: 1730

Removed:
   genpatches-2.6/trunk/2.6.34/2730_i915-PLL-permissive-search-fix.patch
Modified:
   genpatches-2.6/trunk/2.6.34/0000_README
Log:
Linux patch 2.6.34.2. Removed redundant patch for i915

Modified: genpatches-2.6/trunk/2.6.34/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.34/0000_README	2010-08-02 14:36:49 UTC (rev 1729)
+++ genpatches-2.6/trunk/2.6.34/0000_README	2010-08-02 19:03:15 UTC (rev 1730)
@@ -43,6 +43,10 @@
 From:   http://www.kernel.org
 Desc:   Linux 2.6.34.1
 
+Patch:  1001_linux-2.6.34.2.patch
+From:   http://www.kernel.org
+Desc:   Linux 2.6.34.2
+
 Patch:	2600_synaptic-cap-ID-check-fix.patch
 From:	http://bugs.gentoo.org/show_bug.cgi?id=328527
 Desc:	Synaptics capability ID check fix
@@ -55,10 +59,6 @@
 From:	http://lkml.org/lkml/2010/6/25/271
 Desc:   add missing define to prevent re-define errors in vgaarb.h
 
-Patch:	2730_i915-PLL-permissive-search-fix.patch
-From:	http://bugs.gentoo.org/show_bug.cgi?id=325619
-Desc:   Make G4X-style PLL search more permissive
-
 Patch:	2900_xconfig-with-qt4.patch
 From:	http://bugs.gentoo.org/show_bug.cgi?id=320761
 Desc:	xconfig patch for qt4 - thanks to Sam Iam

Deleted: genpatches-2.6/trunk/2.6.34/2730_i915-PLL-permissive-search-fix.patch
===================================================================
--- genpatches-2.6/trunk/2.6.34/2730_i915-PLL-permissive-search-fix.patch	2010-08-02 14:36:49 UTC (rev 1729)
+++ genpatches-2.6/trunk/2.6.34/2730_i915-PLL-permissive-search-fix.patch	2010-08-02 19:03:15 UTC (rev 1730)
@@ -1,13 +0,0 @@
---- a/drivers/gpu/drm/i915/intel_display.c	2010-07-30 08:40:58.000000000 -0400
-+++ b/drivers/gpu/drm/i915/intel_display.c	2010-07-30 08:42:12.000000000 -0400
-@@ -880,8 +880,8 @@ intel_g4x_find_best_PLL(const intel_limi
- 	intel_clock_t clock;
- 	int max_n;
- 	bool found;
--	/* approximately equals target * 0.00488 */
--	int err_most = (target >> 8) + (target >> 10);
-+    /* approximately equals target * 0.00585 */
-+    int err_most = (target >> 8) + (target >> 9);
- 	found = false;
- 
- 	if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) {