rpms/kernel/devel config-x86-generic, 1.68, 1.69 kernel.spec, 1.1299, 1.1300

[Jeremy Katz]

Author: katzj

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25549

Modified Files:
	config-x86-generic kernel.spec 
Log Message:
* Mon Feb 16 2009 Jeremy Katz <katzj at redhat.com>
- Switch msr and cpuid to be built-in on x86 since there isn't anything to really autoload them (and if there
  was, they'd just end up always being loaded)



Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- config-x86-generic	12 Feb 2009 09:10:10 -0000	1.68
+++ config-x86-generic	16 Feb 2009 16:40:11 -0000	1.69
@@ -65,8 +65,8 @@
 CONFIG_SONYPI=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_MICROCODE=m
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
+CONFIG_X86_MSR=y
+CONFIG_X86_CPUID=y
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 # CONFIG_NUMA is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1299
retrieving revision 1.1300
diff -u -r1.1299 -r1.1300
--- kernel.spec	14 Feb 2009 23:14:18 -0000	1.1299
+++ kernel.spec	16 Feb 2009 16:40:11 -0000	1.1300
@@ -1751,6 +1751,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Feb 16 2009 Jeremy Katz <katzj at redhat.com>
+- Switch msr and cpuid to be built-in on x86 since there isn't anything to really autoload them (and if there
+  was, they'd just end up always being loaded)
+
 * Sat Feb 14 2009 Eric Sandeen <sandeen at redhat.com>
 - Fix ext4 hang on livecd-creator (#484522)