From 6034f5263b04807eba8ca40f11b93b1b86661f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= Date: Wed, 4 Jul 2012 16:36:28 +0200 Subject: [PATCH] --- yaml --- r: 313183 b: refs/heads/master c: c6fd6d113df3dd433d31001d173789464427ad22 h: refs/heads/master i: 313181: d1399920515bad655060a37a41bd7fd08210fc4d 313179: db79377c392a1dce87dc9ebece5d043ac26015c7 313175: 3fd9b72e000a96dd49122df1d9e0497a716d1147 313167: 618b0f7db2c52b9d76b6e165fa22ef0b3cb5e3d6 313151: fe6d0a8ba3ba0f750da048eec8a7d82612a5bb41 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/Kconfig | 1 + trunk/arch/arm/mach-imx/mach-mx35_3ds.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5b97cb30b238..6898747c1c7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 114ea991eca8ae706c42b1884aec83033be274b1 +refs/heads/master: c6fd6d113df3dd433d31001d173789464427ad22 diff --git a/trunk/arch/arm/mach-imx/Kconfig b/trunk/arch/arm/mach-imx/Kconfig index 0345e853e596..5a7d235902c7 100644 --- a/trunk/arch/arm/mach-imx/Kconfig +++ b/trunk/arch/arm/mach-imx/Kconfig @@ -589,6 +589,7 @@ config MACH_MX35_3DS select IMX_HAVE_PLATFORM_IPU_CORE select IMX_HAVE_PLATFORM_MXC_EHCI select IMX_HAVE_PLATFORM_MXC_NAND + select IMX_HAVE_PLATFORM_MXC_RTC select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX help Include support for MX35PDK platform. This includes specific diff --git a/trunk/arch/arm/mach-imx/mach-mx35_3ds.c b/trunk/arch/arm/mach-imx/mach-mx35_3ds.c index 28aa19476de7..85568ba43640 100644 --- a/trunk/arch/arm/mach-imx/mach-mx35_3ds.c +++ b/trunk/arch/arm/mach-imx/mach-mx35_3ds.c @@ -572,6 +572,7 @@ static void __init mx35_3ds_init(void) imx35_add_fec(NULL); imx35_add_imx2_wdt(NULL); + imx35_add_mxc_rtc(); platform_add_devices(devices, ARRAY_SIZE(devices)); imx35_add_imx_uart0(&uart_pdata);