rpms/kernel/F-9 linux-2.6-hwmon-hdaps-add-new-models.patch, NONE, 1.1 kernel.spec, 1.707, 1.708

Thu Jul 10 00:27:09 UTC 2008

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23995

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-hwmon-hdaps-add-new-models.patch 
Log Message:
* Wed Jul 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.10-89
- hdaps: support new Lenovo notebook models (#449888)


linux-2.6-hwmon-hdaps-add-new-models.patch:

--- NEW FILE linux-2.6-hwmon-hdaps-add-new-models.patch ---

hdaps: add new lenovo models

Comination of these three upstream commits:

commit ca68d0ac16539a062ae26ca50da8b186fa3a0814
hdaps: invert the axes for HDAPS on Lenovo R61i ThinkPads

commit a4fa7ef037b17f2a3b9b393cb924e571fc04e784
hdaps: fix module loading on Thinkpad T61P

commit 292d73551d0aa19526c3417e791c529b49ebadf3
hdaps: add support for various newer Lenovo thinkpads

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>
---

redhat bz 449888

diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
index 26df06f..50f2269 100644
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@ -515,16 +515,24 @@ static struct dmi_system_id __initdata hdaps_whitelist[] = {
 	HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
 	HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
 	HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R52"),
+	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61i"),
+	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61"),
 	HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p"),
 	HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T41"),
 	HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T42p"),
 	HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T42"),
 	HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T43"),
 	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T60"),
+	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61p"),
+	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61"),
 	HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X40"),
 	HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X41"),
 	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X60"),
+	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61s"),
+	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61"),
 	HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad Z60m"),
+	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61m"),
+	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61p"),
 	{ .ident = NULL }
 };
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.707
retrieving revision 1.708
diff -u -r1.707 -r1.708
--- kernel.spec	8 Jul 2008 21:40:34 -0000	1.707
+++ kernel.spec	10 Jul 2008 00:26:11 -0000	1.708
@@ -624,6 +624,7 @@
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch451: linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch
 Patch452: linux-2.6-hwmon-applesmc-remove-debugging-messages.patch
+Patch453: linux-2.6-hwmon-hdaps-add-new-models.patch
 Patch460: linux-2.6-serial-460800.patch
 Patch510: linux-2.6-silence-noise.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
@@ -1182,6 +1183,8 @@
 ApplyPatch linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch
 # kill annoying applesmc debug messages
 ApplyPatch linux-2.6-hwmon-applesmc-remove-debugging-messages.patch
+# add new models to hdaps
+ApplyPatch linux-2.6-hwmon-hdaps-add-new-models.patch
 
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
@@ -1871,29 +1874,32 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
-* Tue Jul 08 2008 Eric Sandeen <sandeen at redhat.com>
+* Wed Jul 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.10-89
+- hdaps: support new Lenovo notebook models (#449888)
+
+* Tue Jul 08 2008 Eric Sandeen <sandeen at redhat.com> 2.6.25.10-88
 - Fix reiserfs list corruption (#453699)
 
-* Tue Jul 08 2008 John W. Linville <linville at redhat.com> 2.6.25.9-87
+* Tue Jul 08 2008 John W. Linville <linville at redhat.com> 2.6.25.10-87
 - Upstream wireless fixes from 2008-07-07
   (http://marc.info/?l=linux-wireless&m=121546143025524&w=2)
 
-* Mon Jul 07 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.9-86
+* Mon Jul 07 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.10-86
 - Fix USB interrupt handling with shared interrupts.
 
-* Fri Jul 04 2008 John W. Linville <linville at redhat.com> 2.6.25.9-85
+* Fri Jul 04 2008 John W. Linville <linville at redhat.com> 2.6.25.10-85
 - Upstream wireless fixes from 2008-07-02
   (http://marc.info/?l=linux-netdev&m=121503163124089&w=2)
 - Apply Stefan Becker's fix for bad hunk of wireless build fixups for 2.6.25
   (https://bugzilla.redhat.com/show_bug.cgi?id=453390#c36)
 
-* Fri Jul 04 2008 Dave Jones <davej at redhat.com>
+* Fri Jul 04 2008 Dave Jones <davej at redhat.com> 2.6.25.10-84
 - Better fix for the Nikon D80 usb-storage quirk.
 
-* Thu Jul 03 2008 Dave Jones <davej at redhat.com>
+* Thu Jul 03 2008 Dave Jones <davej at redhat.com> 2.6.25.10-83
 - Add USB Storage quirk for Nikon D40 with new firmware.
 
-* Thu Jul 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.9-82
+* Thu Jul 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.10-82
 - Linux 2.6.25.10
 - Reverted stable patch, not needed with utrace:
 	x86_64-ptrace-fix-sys32_ptrace-task_struct-leak.patch


