rpms/kernel/F-13 config-generic, 1.360, 1.361 config-x86-generic, 1.93, 1.94 config-x86_64-generic, 1.103, 1.104 kernel.spec, 1.2019, 1.2020

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18677

Modified Files:
	config-generic config-x86-generic config-x86_64-generic 
	kernel.spec 
Log Message:
* Wed May 5 2010 Kyle McMartin <kyle at redhat.com> 2.6.33.3-84
- CONFIG_HWMON=y => CONFIG_THERMAL_HWMON. Kconfig is worse than rabies.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/config-generic,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -p -r1.360 -r1.361
--- config-generic	26 Apr 2010 21:50:37 -0000	1.360
+++ config-generic	5 May 2010 18:37:02 -0000	1.361
@@ -3717,7 +3717,7 @@ CONFIG_ENABLE_MUST_CHECK=y
 
 CONFIG_KEXEC=y
 
-CONFIG_HWMON=m
+CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/config-x86-generic,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- config-x86-generic	25 Jan 2010 17:40:14 -0000	1.93
+++ config-x86-generic	5 May 2010 18:37:02 -0000	1.94
@@ -332,6 +332,7 @@ CONFIG_USB_HIDINPUT_POWERBOOK=y
 # CONFIG_SGI_IOC4 is not set
 
 CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACERHDF=m
 CONFIG_ASUS_LAPTOP=m
 CONFIG_COMPAL_LAPTOP=m
 CONFIG_EEEPC_LAPTOP=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/config-x86_64-generic,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- config-x86_64-generic	3 May 2010 21:16:31 -0000	1.103
+++ config-x86_64-generic	5 May 2010 18:37:02 -0000	1.104
@@ -111,6 +111,7 @@ CONFIG_ACPI_POWER_METER=m
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 
 CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACERHDF=m
 CONFIG_ASUS_LAPTOP=m
 CONFIG_COMPAL_LAPTOP=m
 CONFIG_FUJITSU_LAPTOP=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/kernel.spec,v
retrieving revision 1.2019
retrieving revision 1.2020
diff -u -p -r1.2019 -r1.2020
--- kernel.spec	5 May 2010 12:59:09 -0000	1.2019
+++ kernel.spec	5 May 2010 18:37:02 -0000	1.2020
@@ -2191,6 +2191,9 @@ fi
 # and build.
 
 %changelog
+* Wed May 5 2010 Kyle McMartin <kyle at redhat.com> 2.6.33.3-84
+- CONFIG_HWMON=y => CONFIG_THERMAL_HWMON. Kconfig is worse than rabies.
+
 * Wed May 5 2010 Kyle McMartin <kyle at redhat.com> 2.6.33.3-83
 - disable-i8042-check-on-apple-mac.patch: fix build on ppc.