[kernel] r12913 - in dists/trunk/linux-2.6/debian: . config/mips

[Martin Michlmayr]

Author: tbm
Date: Sun Feb 22 18:14:20 2009
New Revision: 12913

Log:
Fix RTC on SGI machines.


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
   dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Feb 22 18:14:20 2009
@@ -20,6 +20,10 @@
   [ Bastian Blank ]
   * Use external source directory for all builds.
 
+  [ Martin Michlmayr ]
+  * [mips/r4k-ip22] Build in RTC_DRV_DS1286.
+  * [mips/r5k-ip32] Build in RTC_DRV_CMOS.
+
  -- maximilian attems <maks at debian.org>  Thu, 19 Feb 2009 13:25:20 +0100
 
 linux-2.6 (2.6.28-2) UNRELEASED; urgency=low

Modified: dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22	(original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22	Sun Feb 22 18:14:20 2009
@@ -121,10 +121,6 @@
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 # CONFIG_PPDEV is not set
-CONFIG_RTC=m
-CONFIG_SGI_DS1286=y
-CONFIG_GEN_RTC=y
-CONFIG_GEN_RTC_X=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_TELCLOCK is not set
@@ -615,3 +611,9 @@
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_MPU401 is not set
 
+##
+## file: drivers/rtc/Kconfig
+##
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1286=y
+

Modified: dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32	(original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32	Sun Feb 22 18:14:20 2009
@@ -120,9 +120,6 @@
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 # CONFIG_PPDEV is not set
-CONFIG_RTC=m
-CONFIG_GEN_RTC=y
-CONFIG_GEN_RTC_X=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
@@ -779,3 +776,8 @@
 # CONFIG_SND_VX222 is not set
 # CONFIG_SND_YMFPCI is not set
 
+## file: drivers/rtc/Kconfig
+##
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_CMOS=y
+