[PATCH][Quantal] UBUNTU: config: compile the rtc-pl031 driver as static on the highbank kernel flavour

[Chris Van Hoof]

From: Dann Frazier <dann.frazier at canonical.com>

The rtc-pl031 driver is used for the RTC on the highbank
platform. Presently it is built as a module in Precise and
Quantal, making the driver unavailable in early boot, yielding
the following error on both releases:

./drivers/rtc/hctosys.c: unable to open rtc device (rtc0)

This behaviour prevents the ability to accurately check the
last-mounted time on the root filesystem.

BugLink: https://bugs.launchpad.net/bugs/1035110
Signed-off-by: Dann Frazier <dann.frazier at canonical.com>
Signed-off-by: Chris Van Hoof <vanhoof at canonical.com>
Cc: Ike Pan <ike.pan at canonical.com>
---
 debian.master/config/armel/config.common.armel     |    1 +
 debian.master/config/armhf/config.flavour.highbank |    1 +
 debian.master/config/armhf/config.flavour.omap     |    1 +
 debian.master/config/config.common.ubuntu          |    1 -
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index ee2ed97..4488920 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -199,6 +199,7 @@ CONFIG_RELAY=y
 # CONFIG_RT2800USB_UNKNOWN is not set
 CONFIG_RT2X00_LIB_DEBUGFS=y
 CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_TWL4030=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SATA_AHCI_PLATFORM=m
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 2f7f91d..36f1d8e 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -135,6 +135,7 @@ CONFIG_PREEMPT_RCU=y
 # CONFIG_REISERFS_FS_POSIX_ACL is not set
 # CONFIG_REISERFS_FS_SECURITY is not set
 # CONFIG_RELAY is not set
+CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_TWL4030=m
 CONFIG_SATA_AHCI_PLATFORM=y
 # CONFIG_SCHED_AUTOGROUP is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 16eb583..11d014e 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -135,6 +135,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
 CONFIG_RELAY=y
+CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_TWL4030=y
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SCHED_AUTOGROUP=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 7f8337f..e69d07e 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4536,7 +4536,6 @@ CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PL030=m
-CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_PS3=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RP5C01=m
-- 
1.7.9.5