From d286ad7298871440feb889e8c607633e67acb67e Mon Sep 17 00:00:00 2001
From: Nicolas Kaiser <nikai@nikai.net>
Date: Tue, 5 Oct 2010 20:31:54 +0200
Subject: [PATCH] --- yaml --- r: 217316 b: refs/heads/master c:
 e1a75a1aa11a4f48668ef295368ae1b65bd960c7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 35223246256f..15f0dae6a3ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e66345297d9ab3566eff0503d79eedda3c652428
+refs/heads/master: e1a75a1aa11a4f48668ef295368ae1b65bd960c7
diff --git a/trunk/arch/arm/plat-omap/fb.c b/trunk/arch/arm/plat-omap/fb.c
index fffc1a0b78a7..f2a1483bdad9 100644
--- a/trunk/arch/arm/plat-omap/fb.c
+++ b/trunk/arch/arm/plat-omap/fb.c
@@ -126,7 +126,7 @@ static int set_fbmem_region_type(struct omapfb_mem_region *rg, int mem_type,
 	 * type = 0 && paddr = 0, a default don't care case maps to
 	 * the SDRAM type.
 	 */
-	if (rg->type || (!rg->type && !rg->paddr))
+	if (rg->type || !rg->paddr)
 		return 0;
 	if (ranges_overlap(rg->paddr, rg->size, mem_start, mem_size)) {
 		rg->type = mem_type;