[kernel] r8842 - in dists/trunk/linux-2.6/debian: . arch

Thu May 31 14:15:43 UTC 2007

Author: maks
Date: Thu May 31 14:15:43 2007
New Revision: 8842

Log:
group rtc subsys variables, set DRV_MAX6900


Modified:
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/changelog

Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================

--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Thu May 31 14:15:43 2007
@@ -871,6 +871,47 @@
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_ISER=m
 
+#
+# Real Time Clock
+#
+CONFIG_RTC_CLASS=m
+
+#
+## RTC interfaces
+#
+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_TEST is not set
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+
+#
+# SPI RTC drivers
+#
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_MAX6902=m
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_V3020=m
+
 CONFIG_USB_XUSBATM=m
 CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_SERIAL_8250_FOURPORT=m
@@ -1176,31 +1217,15 @@
 CONFIG_RTC_LIB=m
 CONFIG_GIGASET_BASE=m
 CONFIG_NEW_LEDS=y
-CONFIG_RTC_DRV_M48T86=m
 CONFIG_SND_RIPTIDE=m
-# CONFIG_RTC_DRV_TEST is not set
 CONFIG_W1_MASTER_MATROX=m
-
-#
-## RTC interfaces
-#
-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_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_USB_ZC0301=m
-CONFIG_RTC_DRV_CMOS=m
-CONFIG_RTC_DRV_X1205=m
 CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_RTC_DRV_DS1672=m
 CONFIG_LEDS_CLASS=m
 # CONFIG_USB_GADGET_AT91 is not set
-CONFIG_RTC_CLASS=m
-CONFIG_RTC_DRV_PCF8563=m
 CONFIG_GIGASET_M105=m
 CONFIG_GIGASET_M101=m
 CONFIG_ISDN_DRV_GIGASET=m
@@ -1210,7 +1235,6 @@
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_GIGASET_DEBUG is not set
 CONFIG_W1_MASTER_DS2482=m
-CONFIG_RTC_DRV_RS5C372=m
 CONFIG_WIRELESS_EXT=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_SND_ALS300=m
@@ -1229,7 +1253,6 @@
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_DMA_ENGINE=y
-CONFIG_RTC_DRV_ISL1208=m
 # CONFIG_UFS_DEBUG is not set
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_INET_XFRM_MODE_TUNNEL=m
@@ -1244,16 +1267,12 @@
 CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_JFFS2_FS_POSIX_ACL=y
 # CONFIG_RT_MUTEX_TESTER is not set
-CONFIG_RTC_DRV_DS1553=m
 CONFIG_PC8736x_GPIO=m
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_NSC_GPIO=m
 # CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set
 CONFIG_SND_INDIGO=m
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_PCF8583=m
 # CONFIG_TASKSTATS is not set
-CONFIG_RTC_DRV_MAX6902=m
 CONFIG_TCP_CONG_VENO=m
 CONFIG_NET_DMA=y
 # CONFIG_CIFS_DEBUG2 is not set
@@ -1261,13 +1280,11 @@
 CONFIG_DVB_ISL6421=m
 CONFIG_W1_CON=y
 CONFIG_INOTIFY_USER=y
-CONFIG_RTC_DRV_V3020=m
 CONFIG_ACPI_DOCK=m
 CONFIG_SMSC_PHY=m
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 # CONFIG_DEBUG_RT_MUTEXES is not set
-CONFIG_RTC_DRV_DS1742=m
 CONFIG_USB_QUICKCAM_MESSENGER=m
 CONFIG_OCFS2_DEBUG_MASKLOG=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
@@ -1371,7 +1388,6 @@
 CONFIG_SND_MONA=m
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_CIFS_WEAK_PW_HASH is not set
-CONFIG_RTC_DRV_DS1307=m
 # CONFIG_LCD_CLASS_DEVICE is not set
 # CONFIG_FB_BACKLIGHT is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu May 31 14:15:43 2007
@@ -12,8 +12,9 @@
     DVB_USB_AU6610, DVB_USB_OPERA1, SENSORS_AD7418, SENSORS_ADM1029,
     SENSORS_F75375S, SENSORS_CORETEMP, SENSORS_MAX6650, SENSORS_APPLESMC,
     I2C_SIMTEC, I2C_TINY_USB, SC92031, LIBERTAS_USB, RFKILL, RFKILL_INPUT,
-    MTD_UBI, SND_USB_CAIAQ, SND_USB_CAIAQ_INPUT, USB_BERRY_CHARGE and
-    disable SCSI_ESP_CORE, SPI_SPIDEV, CRYPT_CRYPTD in topconfig.
+    MTD_UBI, SND_USB_CAIAQ, SND_USB_CAIAQ_INPUT, USB_BERRY_CHARGE,
+    RTC_DRV_MAX6900 and disable SCSI_ESP_CORE, SPI_SPIDEV, CRYPT_CRYPTD
+    in topconfig.
   * [amd64, i386]: Take care of the renaming acpi-ibm to thinkpad-acpi.
     Enable KINGSUN_DONGLE, AF_RXRPC, RXKAD, MTD_NAND_PLATFORM, BLINK, PHANTOM.
     Disable OSS_OBSOLETE.
@@ -39,7 +40,7 @@
     on ARM.
   * arm/ixp4xx: Add patch to set NSLU2 timer frequency.
 
- -- maximilian attems <maks at debian.org>  Thu, 31 May 2007 16:00:53 +0200
+ -- maximilian attems <maks at debian.org>  Thu, 31 May 2007 16:15:40 +0200
 
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low
 

