[kernel] r15109 - dists/lenny/linux-2.6/debian/patches/bugfix/all

[Maximilian Attems]

Author: maks
Date: Thu Feb  4 01:02:41 2010
New Revision: 15109

Log:
fix previous patch matroxfb to really apply to 2.6.26

changes due to macro cleanups since

Modified:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/matroxfb-fix-problems-with-display-stability.patch

Modified: dists/lenny/linux-2.6/debian/patches/bugfix/all/matroxfb-fix-problems-with-display-stability.patch
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/bugfix/all/matroxfb-fix-problems-with-display-stability.patch	Thu Feb  4 00:46:45 2010	(r15108)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/matroxfb-fix-problems-with-display-stability.patch	Thu Feb  4 01:02:41 2010	(r15109)
@@ -31,15 +31,17 @@
  drivers/video/matrox/g450_pll.c |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
+diff --git a/drivers/video/matrox/g450_pll.c b/drivers/video/matrox/g450_pll.c
+index d42346e..3dcb6d2 100644
 --- a/drivers/video/matrox/g450_pll.c
 +++ b/drivers/video/matrox/g450_pll.c
-@@ -368,7 +368,8 @@ static int __g450_setclk(struct matrox_f
+@@ -341,7 +341,8 @@ static int __g450_setclk(WPMINFO unsigned int fout, unsigned int pll,
  					M1064_XDVICLKCTRL_C1DVICLKEN |
  					M1064_XDVICLKCTRL_DVILOOPCTL |
  					M1064_XDVICLKCTRL_P1LOOPBWDTCTL;
--				matroxfb_DAC_out(minfo, M1064_XDVICLKCTRL, tmp);
-+                                /* Setting this breaks PC systems so don't do it */
-+				/* matroxfb_DAC_out(minfo, M1064_XDVICLKCTRL, tmp); */
- 				matroxfb_DAC_out(minfo, M1064_XPWRCTRL,
+-				matroxfb_DAC_out(PMINFO M1064_XDVICLKCTRL,tmp);
++				/* Setting this breaks PC systems so don't do it */
++				/* matroxfb_DAC_out(PMINFO M1064_XDVICLKCTRL,tmp); */
+ 				matroxfb_DAC_out(PMINFO M1064_XPWRCTRL,
  						 xpwrctrl);