rpms/kernel/devel config-generic, 1.61, 1.62 config-x86-generic, 1.24, 1.25 config-x86_64-generic, 1.21, 1.22 kernel.spec, 1.389, 1.390

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11498

Modified Files:
	config-generic config-x86-generic config-x86_64-generic 
	kernel.spec 
Log Message:
* Mon Jan 28 2008 Chuck Ebbert <cebbert at redhat.com>
- Build in the CMOS RTC driver.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- config-generic	23 Jan 2008 21:03:41 -0000	1.61
+++ config-generic	28 Jan 2008 23:15:42 -0000	1.62
@@ -1920,12 +1920,11 @@
 # CONFIG_GEN_RTC is not set
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_HCTOSYS is not set
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- config-x86-generic	23 Jan 2008 00:37:23 -0000	1.24
+++ config-x86-generic	28 Jan 2008 23:15:42 -0000	1.25
@@ -51,7 +51,6 @@
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_HPET=y
 CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
 # CONFIG_HPET_RTC_IRQ is not set
 # CONFIG_HPET_MMAP is not set
 CONFIG_X86_LOCAL_APIC=y
@@ -78,7 +77,6 @@
 CONFIG_EFI=y
 CONFIG_EFI_VARS=y
 CONFIG_EFI_PCDP=y
-CONFIG_EFI_RTC=y
 CONFIG_FB_IMAC=y
 
 # CONFIG_PCI_GOBIOS is not set


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- config-x86_64-generic	21 Jan 2008 23:42:51 -0000	1.21
+++ config-x86_64-generic	28 Jan 2008 23:15:42 -0000	1.22
@@ -32,7 +32,6 @@
 CONFIG_EFI=y
 CONFIG_EFI_VARS=y
 CONFIG_EFI_PCDP=y
-CONFIG_EFI_RTC=y
 
 CONFIG_I2O=m
 CONFIG_I2O_BLOCK=m
@@ -116,7 +115,6 @@
 CONFIG_HPET=y
 # CONFIG_HPET_MMAP is not set
 # CONFIG_HPET_RTC_IRQ is not set
-CONFIG_HPET_EMULATE_RTC=y
 CONFIG_PM=y
 
 CONFIG_IEEE80211=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- kernel.spec	28 Jan 2008 22:37:22 -0000	1.389
+++ kernel.spec	28 Jan 2008 23:15:42 -0000	1.390
@@ -1770,6 +1770,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Mon Jan 28 2008 Chuck Ebbert <cebbert at redhat.com>
+- Build in the CMOS RTC driver.
+
 * Mon Jan 28 2008 Jarod Wilson <jwilson at redhat.com>
 - Update firewire with latest pending bits
 - Add epoll lockdep annotation (#323411)