From cbc146ddecc34250a8d2ab25f00d0a13a8e8d807 Mon Sep 17 00:00:00 2001
From: Martin Michlmayr <tbm@cyrius.com>
Date: Wed, 1 Apr 2009 17:09:23 +0000
Subject: [PATCH] [mips*/4kc-malta, mips*/5kc-malta] Build in RTC_DRV_CMOS.

svn path=/dists/sid/linux-2.6/; revision=13311
---
 debian/changelog                      | 1 +
 debian/config/mips/config.4kc-malta   | 4 ++--
 debian/config/mips/config.5kc-malta   | 3 +--
 debian/config/mipsel/config.4kc-malta | 4 ++--
 debian/config/mipsel/config.5kc-malta | 5 ++---
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac375397f..10457ebd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ linux-2.6 (2.6.29-2) UNRELEASED; urgency=low
 
   [ Martin Michlmayr ]
   * [arm/ixp4xx] Build in LEDS_TRIGGER_TIMER (closes: #521141).
+  * [mips*/4kc-malta, mips*/5kc-malta] Build in RTC_DRV_CMOS.
 
   [ maximilian attems ]
   * linux-libc-dev: Bump versioned replaces libdrm-dev.
diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta
index bbb27836c..3587da7bf 100644
--- a/debian/config/mips/config.4kc-malta
+++ b/debian/config/mips/config.4kc-malta
@@ -233,7 +233,6 @@ CONFIG_VT_CONSOLE=y
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
-CONFIG_RTC=y
 CONFIG_DTLK=m
 CONFIG_R3964=m
 CONFIG_APPLICOM=m
@@ -1062,7 +1061,7 @@ CONFIG_ZD1211RW=m
 ##
 ## file: drivers/rtc/Kconfig
 ##
-CONFIG_RTC_CLASS=m
+CONFIG_RTC_CLASS=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
@@ -1081,6 +1080,7 @@ CONFIG_RTC_DRV_RS5C348=m
 # CONFIG_RTC_DRV_DS1742 is not set
 CONFIG_RTC_DRV_M48T86=m
 # CONFIG_RTC_DRV_V3020 is not set
+CONFIG_RTC_DRV_CMOS=y
 
 ##
 ## file: drivers/scsi/Kconfig
diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta
index 247ef27a4..17a221fec 100644
--- a/debian/config/mips/config.5kc-malta
+++ b/debian/config/mips/config.5kc-malta
@@ -220,7 +220,6 @@ CONFIG_VT_CONSOLE=y
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
-CONFIG_RTC=y
 CONFIG_R3964=m
 CONFIG_APPLICOM=m
 
@@ -1302,7 +1301,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_MAX6902=m
 CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 CONFIG_RTC_DRV_M48T86=m
diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta
index da99b0067..2c6e73675 100644
--- a/debian/config/mipsel/config.4kc-malta
+++ b/debian/config/mipsel/config.4kc-malta
@@ -233,7 +233,6 @@ CONFIG_VT_CONSOLE=y
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
-CONFIG_RTC=y
 CONFIG_DTLK=m
 CONFIG_APPLICOM=m
 
@@ -1061,7 +1060,7 @@ CONFIG_ZD1211RW=m
 ##
 ## file: drivers/rtc/Kconfig
 ##
-CONFIG_RTC_CLASS=m
+CONFIG_RTC_CLASS=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
@@ -1080,6 +1079,7 @@ CONFIG_RTC_DRV_RS5C348=m
 # CONFIG_RTC_DRV_DS1742 is not set
 CONFIG_RTC_DRV_M48T86=m
 # CONFIG_RTC_DRV_V3020 is not set
+CONFIG_RTC_DRV_CMOS=y
 
 ##
 ## file: drivers/scsi/Kconfig
diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta
index 9406be79f..5a2e71bdf 100644
--- a/debian/config/mipsel/config.5kc-malta
+++ b/debian/config/mipsel/config.5kc-malta
@@ -220,7 +220,6 @@ CONFIG_VT_CONSOLE=y
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
-CONFIG_RTC=y
 CONFIG_APPLICOM=m
 
 ##
@@ -1286,7 +1285,7 @@ CONFIG_ZD1211RW=m
 ##
 ## file: drivers/rtc/Kconfig
 ##
-CONFIG_RTC_CLASS=m
+CONFIG_RTC_CLASS=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
@@ -1302,7 +1301,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_MAX6902=m
 CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 CONFIG_RTC_DRV_M48T86=m