Merge tag 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...

[deliverable/linux.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 8c8377d50c4c4578724c6149bbd084744e7c92fb..08cbdb900a18a290a7065bc73850015f8278ca10 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/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
@@ -838,7 +827,7 @@ config RTC_DRV_AT32AP700X
 
 config RTC_DRV_AT91RM9200
        tristate "AT91RM9200 or some AT91SAM9 RTC"
-       depends on ARCH_AT91RM9200 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45
+       depends on ARCH_AT91
        help
          Driver for the internal RTC (Realtime Clock) module found on
          Atmel AT91RM9200's and some  AT91SAM9 chips. On AT91SAM9 chips
@@ -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_DRV_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