From 0cc79fc9c1de3d14526526bcb7358af6f56725b6 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <festevam@gmail.com>
Date: Tue, 29 May 2012 15:07:37 -0700
Subject: [PATCH] --- yaml --- r: 308991 b: refs/heads/master c:
 b224b9ac8c42afc40cba170187df3d0cdbb13c20 h: refs/heads/master i:   308989:
 56798087225a8b25a21e6f1d81718f6ee69d4a94   308987:
 e79f81b395f71134cceb4c2d57c56f91a07eaf81   308983:
 4d2ecac8e67b02c6ea5b75bf2f663573036b3955   308975:
 c9e0749440730232b570d178446d6079fa186ad4   308959:
 9537140b2b7db392b8b13848b146bac8825975e5   308927:
 1547bdeda8a054313e70e23cb5a870393fc73c44   308863:
 60a4fa2b5765e7100a062fbc3c91a5bb611eadc9   308735:
 3a272cbf4d8804389c99dfc8f36c7b47b68a3c0d v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/rtc/Kconfig | 42 +++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index dce0c372453c..fe7545a5a06e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f20b767e20a800030f51712b699a5c557f2514b
+refs/heads/master: b224b9ac8c42afc40cba170187df3d0cdbb13c20
diff --git a/trunk/drivers/rtc/Kconfig b/trunk/drivers/rtc/Kconfig
index 4161bfe462cd..83fb48fa7cf4 100644
--- a/trunk/drivers/rtc/Kconfig
+++ b/trunk/drivers/rtc/Kconfig
@@ -620,27 +620,6 @@ config RTC_DRV_MSM6242
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-msm6242.
 
-config RTC_DRV_IMXDI
-	tristate "Freescale IMX DryIce Real Time Clock"
-	depends on ARCH_MX25
-	depends on RTC_CLASS
-	help
-	   Support for Freescale IMX DryIce RTC
-
-	   This driver can also be built as a module, if so, the module
-	   will be called "rtc-imxdi".
-
-config RTC_MXC
-	tristate "Freescale MXC Real Time Clock"
-	depends on ARCH_MXC
-	depends on RTC_CLASS
-	help
-	   If you say yes here you get support for the Freescale MXC
-	   RTC module.
-
-	   This driver can also be built as a module, if so, the module
-	   will be called "rtc-mxc".
-
 config RTC_DRV_BQ4802
 	tristate "TI BQ4802"
 	help
@@ -738,6 +717,16 @@ config RTC_DRV_DAVINCI
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-davinci.
 
+config RTC_DRV_IMXDI
+	tristate "Freescale IMX DryIce Real Time Clock"
+	depends on SOC_IMX25
+	depends on RTC_CLASS
+	help
+	   Support for Freescale IMX DryIce RTC
+
+	   This driver can also be built as a module, if so, the module
+	   will be called "rtc-imxdi".
+
 config RTC_DRV_OMAP
 	tristate "TI OMAP1"
 	depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_DAVINCI_DA8XX
@@ -1087,4 +1076,15 @@ config RTC_DRV_LOONGSON1
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-ls1x.
 
+config RTC_MXC
+	tristate "Freescale MXC Real Time Clock"
+	depends on ARCH_MXC
+	depends on RTC_CLASS
+	help
+	   If you say yes here you get support for the Freescale MXC
+	   RTC module.
+
+	   This driver can also be built as a module, if so, the module
+	   will be called "rtc-mxc".
+
 endif # RTC_CLASS