rpms/kernel/devel kernel-2.6.spec, 1.1725, 1.1726 linux-2.6-radeon-backlight.patch, 1.8, 1.9

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-radeon-backlight.patch 
Log Message:
missing chunk



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1725
retrieving revision 1.1726
diff -u -r1.1725 -r1.1726
--- kernel-2.6.spec	30 Nov 2005 07:41:51 -0000	1.1725
+++ kernel-2.6.spec	30 Nov 2005 18:06:11 -0000	1.1726
@@ -665,7 +665,7 @@
 %patch905 -p1
 
 # Tux
-%patch910 -p1
+#%patch910 -p1
 
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems

linux-2.6-radeon-backlight.patch:
 radeon_base.c |   11 +
 radeon_pm.c   |  557 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 567 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-radeon-backlight.patch	30 Nov 2005 07:26:07 -0000	1.8
+++ linux-2.6-radeon-backlight.patch	30 Nov 2005 18:06:11 -0000	1.9
@@ -590,3 +590,34 @@
  }
  
  void radeonfb_pm_exit(struct radeonfb_info *rinfo)
+--- vanilla/drivers/video/aty/radeon_base.c	2005-02-20 20:08:15.000000000 +0200
++++ linux-2.6.14/drivers/video/aty/radeon_base.c	2005-02-20 20:18:20.000000000 +0200
+@@ -272,6 +272,9 @@
+ #ifdef CONFIG_MTRR
+ static int nomtrr = 0;
+ #endif
++#if defined(CONFIG_PM) && defined(CONFIG_X86)
++int radeon_force_sleep = 0;
++#endif
+ 
+ /*
+  * prototypes
+@@ -2530,6 +2533,10 @@
+ 			force_measure_pll = 1;
+ 		} else if (!strncmp(this_opt, "ignore_edid", 11)) {
+ 			ignore_edid = 1;
++#if defined(CONFIG_PM) && defined(CONFIG_X86)
++		} else if (!strncmp(this_opt, "force_sleep", 11)) {
++			radeon_force_sleep = 1;
++#endif
+ 		} else
+ 			mode_option = this_opt;
+ 	}
+@@ -2585,3 +2592,7 @@
+ MODULE_PARM_DESC(panel_yres, "int: set panel yres");
+ module_param(mode_option, charp, 0);
+ MODULE_PARM_DESC(mode_option, "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\" ");
++#if defined(CONFIG_PM) && defined(CONFIG_X86)
++module_param(radeon_force_sleep, int, 0);
++MODULE_PARM_DESC(radeon_force_sleep, "bool: force ACPI sleep mode on untested machines");
++#endif