From 5d153cf70b650cc587d8a18c4264d7dda5052394 Mon Sep 17 00:00:00 2001
From: Jon Povey <jon.povey@racelogic.co.uk>
Date: Tue, 19 Jul 2011 12:30:11 +0900
Subject: [PATCH] --- yaml --- r: 255006 b: refs/heads/master c:
 9daedd833a38edd90cf7baa1b1fcf61c3a0721e3 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/arm/mach-davinci/board-dm365-evm.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index de3ee79f66bf..aac918b30cc4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33e1e5e317b0fc78ac6588ec8aa40005bcddd7ce
+refs/heads/master: 9daedd833a38edd90cf7baa1b1fcf61c3a0721e3
diff --git a/trunk/arch/arm/mach-davinci/board-dm365-evm.c b/trunk/arch/arm/mach-davinci/board-dm365-evm.c
index c67f684ee3e5..09a87e61ffcf 100644
--- a/trunk/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/trunk/arch/arm/mach-davinci/board-dm365-evm.c
@@ -520,7 +520,7 @@ static void __init evm_init_cpld(void)
 	 */
 	if (have_imager()) {
 		label = "HD imager";
-		mux |= 1;
+		mux |= 2;
 
 		/* externally mux MMC1/ENET/AIC33 to imager */
 		mux |= BIT(6) | BIT(5) | BIT(3);
@@ -540,7 +540,7 @@ static void __init evm_init_cpld(void)
 		resets &= ~BIT(1);
 
 		if (have_tvp7002()) {
-			mux |= 2;
+			mux |= 1;
 			resets &= ~BIT(2);
 			label = "tvp7002 HD";
 		} else {