From 249023b8737e2b7d845209f9a5c894ee480eeedf Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 3 Aug 2011 09:42:39 +0200 Subject: [PATCH] --- yaml --- r: 272531 b: refs/heads/master c: c61daf6b0a2f7048c6e74d52b043fa6a779b128a h: refs/heads/master i: 272529: 1294b46afa2f1b0e11b514cf1d75f6d94a2f2032 272527: 6952e7a4ed09b707384b54fb1d4c0487d1c9ebe8 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx5/Kconfig | 1 - trunk/arch/arm/plat-mxc/devices/Kconfig | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7243d8ec79ce..0272c20e73ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 160a84cfc975f4aaec1cb32a48bba23ccaf43761 +refs/heads/master: c61daf6b0a2f7048c6e74d52b043fa6a779b128a diff --git a/trunk/arch/arm/mach-mx5/Kconfig b/trunk/arch/arm/mach-mx5/Kconfig index d8691a0000c5..b4f5ab669e48 100644 --- a/trunk/arch/arm/mach-mx5/Kconfig +++ b/trunk/arch/arm/mach-mx5/Kconfig @@ -52,7 +52,6 @@ config MACH_MX50_RDP select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX select IMX_HAVE_PLATFORM_SPI_IMX - select IMX_HAVE_PLATFORM_FEC help Include support for MX50 reference design platform (RDP) board. This includes specific configurations for the board and its peripherals. diff --git a/trunk/arch/arm/plat-mxc/devices/Kconfig b/trunk/arch/arm/plat-mxc/devices/Kconfig index bd294add932c..39b08957e8ad 100644 --- a/trunk/arch/arm/plat-mxc/devices/Kconfig +++ b/trunk/arch/arm/plat-mxc/devices/Kconfig @@ -1,6 +1,6 @@ config IMX_HAVE_PLATFORM_FEC bool - default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX51 || SOC_IMX53 + default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX50 || SOC_IMX51 || SOC_IMX53 config IMX_HAVE_PLATFORM_FLEXCAN select HAVE_CAN_FLEXCAN if CAN