rpms/kernel/devel linux-2.6-radeon-backlight.patch,1.12,1.13

[fedora-cvs-commits redhat com]

Author: pjones

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23672

Modified Files:
	linux-2.6-radeon-backlight.patch 
Log Message:
- fix typo
- add another X31 entry


linux-2.6-radeon-backlight.patch:
 radeon_base.c |   11 +
 radeon_pm.c   |  563 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 573 insertions(+), 1 deletion(-)

Index: linux-2.6-radeon-backlight.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-radeon-backlight.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-radeon-backlight.patch	1 Mar 2006 15:16:52 -0000	1.12
+++ linux-2.6-radeon-backlight.patch	1 Mar 2006 15:26:58 -0000	1.13
@@ -3,7 +3,7 @@
 
 --- vanilla/drivers/video/aty/radeon_pm.c	2005-10-27 20:02:08.000000000 -0400
 +++ linux-2.6.14/drivers/video/aty/radeon_pm.c	2005-11-30 02:20:01.000000000 -0500
-@@ -25,8 +25,530 @@
+@@ -25,8 +25,538 @@
  #include <asm/pmac_feature.h>
  #endif
  
@@ -257,7 +257,7 @@
 +			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
 +			DMI_MATCH(DMI_PRODUCT_NAME, "2373FWG"),
 +		},
-+	}
++	},
 +	{
 +		/* Reported by Juerg Billeter <j bitron ch> */
 +		.ident = "IBM ThinkPad T40p (2373-G1G)",
@@ -463,6 +463,14 @@
 +		},
 +	},
 +	{
++		/* Reported by Daniel P. Berrange <berrange redhat com> */
++		.ident = "IBM ThinkPad X31 (2672-JHG)",
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
++			DMI_MATCH(DMI_PRODUCT_NAME, "2672JHG"),
++		},
++	},
++	{
 +		/* Reported by Chris Blizzard <blizzard redhat com> */
 +		.ident = "IBM ThinkPad X31 (2672-RU3)",
 +		.matches = {
@@ -534,7 +542,7 @@
  static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo)
  {
  	u32 tmp;
-@@ -852,7 +1367,14 @@ static void radeon_pm_setup_for_suspend(
+@@ -852,7 +1375,14 @@ static void radeon_pm_setup_for_suspend(
  	/* because both INPLL and OUTPLL take the same lock, that's why. */
  	tmp = INPLL( pllMCLK_MISC) | MCLK_MISC__EN_MCLK_TRISTATE_IN_SUSPEND;
  	OUTPLL( pllMCLK_MISC, tmp);
@@ -550,7 +558,7 @@
  	/* AGP PLL control */
  	if (rinfo->family <= CHIP_FAMILY_RV280) {
  		OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) |  BUS_CNTL1__AGPCLK_VALID);
-@@ -864,6 +1386,7 @@ static void radeon_pm_setup_for_suspend(
+@@ -864,6 +1394,7 @@ static void radeon_pm_setup_for_suspend(
  		OUTREG(BUS_CNTL1, INREG(BUS_CNTL1));
  		OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) | 0x8000);
  	}
@@ -558,7 +566,7 @@
  
  	OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL)
  				  & ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN));
-@@ -2790,6 +3312,29 @@ void radeonfb_pm_init(struct radeonfb_in
+@@ -2790,6 +3320,29 @@ void radeonfb_pm_init(struct radeonfb_in
  	}
  #endif /* defined(CONFIG_PPC_PMAC) */
  #endif /* defined(CONFIG_PM) */