From a92c48cb393624bb7569665d63c9d9d3fad73e1b Mon Sep 17 00:00:00 2001
From: Gerlando Falauto <gerlando.falauto@keymile.com>
Date: Wed, 23 Jan 2013 14:50:59 +0100
Subject: [PATCH] --- yaml --- r: 355127 b: refs/heads/master c:
 830f8b9105b2d88cd2b115994e14bfe992f9a000 h: refs/heads/master i:   355125:
 271b152164cbe250aa1d69e7c6557cbe4121ff2d   355123:
 01a21031032b0161fab116f28f40c6579809f447   355119:
 72ef44dd1f5777aa6bbea96e560ea5a9e1761978 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/plat-orion/mpp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c46fe59c3398..da9e93b6f12c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd2704e82daa93923921dd1c9052ead74b2fdc79
+refs/heads/master: 830f8b9105b2d88cd2b115994e14bfe992f9a000
diff --git a/trunk/arch/arm/plat-orion/mpp.c b/trunk/arch/arm/plat-orion/mpp.c
index e686fe76a96b..7310bcfb299f 100644
--- a/trunk/arch/arm/plat-orion/mpp.c
+++ b/trunk/arch/arm/plat-orion/mpp.c
@@ -49,7 +49,7 @@ void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask,
 					"number (%u)\n", num);
 			continue;
 		}
-		if (variant_mask & !(*mpp_list & variant_mask)) {
+		if (variant_mask && !(*mpp_list & variant_mask)) {
 			printk(KERN_WARNING
 			       "orion_mpp_conf: requested MPP%u config "
 			       "unavailable on this hardware\n", num);