aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/configs/imx_v4_v5_defconfig2
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig2
-rw-r--r--drivers/rtc/Kconfig2
-rw-r--r--drivers/rtc/Makefile2
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index ebda45bd5763..e05a2f1665a7 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -173,7 +173,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
173CONFIG_RTC_CLASS=y 173CONFIG_RTC_CLASS=y
174CONFIG_RTC_DRV_PCF8563=y 174CONFIG_RTC_DRV_PCF8563=y
175CONFIG_RTC_DRV_IMXDI=y 175CONFIG_RTC_DRV_IMXDI=y
176CONFIG_RTC_MXC=y 176CONFIG_RTC_DRV_MXC=y
177CONFIG_DMADEVICES=y 177CONFIG_DMADEVICES=y
178CONFIG_IMX_SDMA=y 178CONFIG_IMX_SDMA=y
179CONFIG_IMX_DMA=y 179CONFIG_IMX_DMA=y
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 12617f7296e6..b1d3675df72c 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -178,7 +178,7 @@ CONFIG_NEW_LEDS=y
178CONFIG_LEDS_CLASS=y 178CONFIG_LEDS_CLASS=y
179CONFIG_RTC_CLASS=y 179CONFIG_RTC_CLASS=y
180CONFIG_RTC_INTF_DEV_UIE_EMUL=y 180CONFIG_RTC_INTF_DEV_UIE_EMUL=y
181CONFIG_RTC_MXC=y 181CONFIG_RTC_DRV_MXC=y
182CONFIG_DMADEVICES=y 182CONFIG_DMADEVICES=y
183CONFIG_IMX_SDMA=y 183CONFIG_IMX_SDMA=y
184CONFIG_EXT2_FS=y 184CONFIG_EXT2_FS=y
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 83fb48fa7cf4..08cbdb900a18 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1076,7 +1076,7 @@ config RTC_DRV_LOONGSON1
1076 This driver can also be built as a module. If so, the module 1076 This driver can also be built as a module. If so, the module
1077 will be called rtc-ls1x. 1077 will be called rtc-ls1x.
1078 1078
1079config RTC_MXC 1079config RTC_DRV_MXC
1080 tristate "Freescale MXC Real Time Clock" 1080 tristate "Freescale MXC Real Time Clock"
1081 depends on ARCH_MXC 1081 depends on ARCH_MXC
1082 depends on RTC_CLASS 1082 depends on RTC_CLASS
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 727ae7786e6c..2973921c30d8 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -61,7 +61,7 @@ obj-$(CONFIG_RTC_DRV_M41T94) += rtc-m41t94.o
61obj-$(CONFIG_RTC_DRV_M48T35) += rtc-m48t35.o 61obj-$(CONFIG_RTC_DRV_M48T35) += rtc-m48t35.o
62obj-$(CONFIG_RTC_DRV_M48T59) += rtc-m48t59.o 62obj-$(CONFIG_RTC_DRV_M48T59) += rtc-m48t59.o
63obj-$(CONFIG_RTC_DRV_M48T86) += rtc-m48t86.o 63obj-$(CONFIG_RTC_DRV_M48T86) += rtc-m48t86.o
64obj-$(CONFIG_RTC_MXC) += rtc-mxc.o 64obj-$(CONFIG_RTC_DRV_MXC) += rtc-mxc.o
65obj-$(CONFIG_RTC_DRV_MAX6900) += rtc-max6900.o 65obj-$(CONFIG_RTC_DRV_MAX6900) += rtc-max6900.o
66obj-$(CONFIG_RTC_DRV_MAX8925) += rtc-max8925.o 66obj-$(CONFIG_RTC_DRV_MAX8925) += rtc-max8925.o
67obj-$(CONFIG_RTC_DRV_MAX8998) += rtc-max8998.o 67obj-$(CONFIG_RTC_DRV_MAX8998) += rtc-max8998.o