diff --git a/[refs] b/[refs]
index d75608565dd3..230228230e7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe8d2727ffa65bcb516b4947bec1c546841e7d25
+refs/heads/master: 58a38ff3b12ebd103e3ca2c5dea3292ffbfd0f02
diff --git a/trunk/drivers/staging/android/Kconfig b/trunk/drivers/staging/android/Kconfig
index 2a2b3867a656..6bb4fa8e5ffd 100644
--- a/trunk/drivers/staging/android/Kconfig
+++ b/trunk/drivers/staging/android/Kconfig
@@ -108,7 +108,7 @@ source "drivers/staging/android/switch/Kconfig"
 config ANDROID_INTF_ALARM
 	bool "Android alarm driver"
 	depends on RTC_CLASS
-	default y
+	default n
 	help
 	  Provides non-wakeup and rtc backed wakeup alarms based on rtc or
 	  elapsed realtime, and a non-wakeup alarm on the monotonic clock.