[kernel] r11973 - in dists/sid/linux-2.6/debian: . config config/amd64 config/i386

[Bastian Blank]

Author: waldi
Date: Tue Aug  5 13:34:48 2008
New Revision: 11973

Log:
* debian/changelog: Update.
* debian/config/config
  - Set RTC_CLASS=y.
  - Set RTC_HCTOSYS.
* debian/config/defines:
  Override ABI changes. They moves symbols from a module to vmlinux.
* debian/config/amd64/config, debian/config/i386/config:
  Set RTC_DRV_CMOS=y.


Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/amd64/config
   dists/sid/linux-2.6/debian/config/config
   dists/sid/linux-2.6/debian/config/defines
   dists/sid/linux-2.6/debian/config/i386/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Aug  5 13:34:48 2008
@@ -67,6 +67,8 @@
     - udplite: Protection against coverage value wrap-around
     - pxamci: trivial fix of DMA alignment register bit clearing
   * [sparc] Install asm-sparc headers again.
+  * Force RTC on by default and set clock on startup. Override ABI changes.
+  * [i386, amd64] Make the CMOS RTC support builtin.
 
   [ Martin Michlmayr ]
   * METH: fix MAC address setup

Modified: dists/sid/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/amd64/config	(original)
+++ dists/sid/linux-2.6/debian/config/amd64/config	Tue Aug  5 13:34:48 2008
@@ -243,9 +243,6 @@
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
 CONFIG_NVRAM=m
-CONFIG_RTC=y
-CONFIG_GEN_RTC=m
-CONFIG_GEN_RTC_X=y
 CONFIG_DTLK=m
 CONFIG_R3964=m
 CONFIG_APPLICOM=m
@@ -253,7 +250,6 @@
 CONFIG_RAW_DRIVER=m
 CONFIG_MAX_RAW_DEVS=256
 CONFIG_HPET=y
-CONFIG_HPET_RTC_IRQ=y
 CONFIG_HPET_MMAP=y
 CONFIG_HANGCHECK_TIMER=m
 
@@ -1124,6 +1120,11 @@
 CONFIG_BATTERY_DS2760=m
 
 ##
+## file: drivers/rtc/Kconfig
+##
+CONFIG_RTC_DRV_CMOS=y
+
+##
 ## file: drivers/scsi/Kconfig
 ##
 CONFIG_SCSI_DPT_I2O=m

Modified: dists/sid/linux-2.6/debian/config/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/config	(original)
+++ dists/sid/linux-2.6/debian/config/config	Tue Aug  5 13:34:48 2008
@@ -734,7 +734,6 @@
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_CAFE_CCIC=m
 CONFIG_V4L_USB_DRIVERS=y
-CONFIG_USB_VIDEO_CLASS=m
 CONFIG_VIDEO_OVCAMCHIP=m
 CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
@@ -831,6 +830,11 @@
 CONFIG_VIDEO_USBVISION=m
 
 ##
+## file: drivers/media/video/uvc/Kconfig
+##
+CONFIG_USB_VIDEO_CLASS=m
+
+##
 ## file: drivers/media/video/zc0301/Kconfig
 ##
 CONFIG_USB_ZC0301=m
@@ -1305,7 +1309,9 @@
 ##
 ## file: drivers/rtc/Kconfig
 ##
-CONFIG_RTC_CLASS=m
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y

Modified: dists/sid/linux-2.6/debian/config/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/defines	(original)
+++ dists/sid/linux-2.6/debian/config/defines	Tue Aug  5 13:34:48 2008
@@ -1,5 +1,7 @@
 [abi]
 abiname: 1
+ignore-changes:
+ rtc_class_close rtc_class_open rtc_device_register rtc_device_unregister rtc_irq_register rtc_irq_set_freq rtc_irq_set_state rtc_irq_unregister rtc_month_days rtc_read_alarm rtc_read_time rtc_set_alarm rtc_set_mmss rtc_set_time rtc_time_to_tm rtc_tm_to_time rtc_update_irq rtc_valid_tm rtc_year_days
 
 [base]
 arches:

Modified: dists/sid/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/i386/config	(original)
+++ dists/sid/linux-2.6/debian/config/i386/config	Tue Aug  5 13:34:48 2008
@@ -324,9 +324,6 @@
 CONFIG_PPDEV=m
 CONFIG_HVC_XEN=y
 CONFIG_NVRAM=m
-CONFIG_RTC=m
-CONFIG_GEN_RTC=m
-CONFIG_GEN_RTC_X=y
 CONFIG_DTLK=m
 CONFIG_R3964=m
 CONFIG_APPLICOM=m
@@ -337,7 +334,6 @@
 CONFIG_RAW_DRIVER=m
 CONFIG_MAX_RAW_DEVS=256
 CONFIG_HPET=y
-CONFIG_HPET_RTC_IRQ=y
 CONFIG_HPET_MMAP=y
 CONFIG_HANGCHECK_TIMER=m
 
@@ -1347,6 +1343,11 @@
 CONFIG_BATTERY_DS2760=m
 
 ##
+## file: drivers/rtc/Kconfig
+##
+CONFIG_RTC_DRV_CMOS=y
+
+##
 ## file: drivers/scsi/Kconfig
 ##
 CONFIG_SCSI_DPT_I2O=m