From ba6a96e7b9fec57f5727d1eb72ff4771232eda48 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Tue, 4 Dec 2012 16:26:09 +0200
Subject: [PATCH] --- yaml --- r: 344675 b: refs/heads/master c:
 09a8c45cbb872f5e861c4385d6967d0aa7f637f1 h: refs/heads/master i:   344673:
 e8f0af88f69af0654af4fa66ba0753e45c5e130d   344671:
 37c2a48e9f7407d983f3d6bbac0cb17e95de33a0 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/video/omap2/omapfb/omapfb-main.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 02eac53ca6df..4b77c2e8db2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b41deecbda70067b26a3a7704fdf967a7940935b
+refs/heads/master: 09a8c45cbb872f5e861c4385d6967d0aa7f637f1
diff --git a/trunk/drivers/video/omap2/omapfb/omapfb-main.c b/trunk/drivers/video/omap2/omapfb/omapfb-main.c
index 708f2cf90204..c2dbfb832a07 100644
--- a/trunk/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/trunk/drivers/video/omap2/omapfb/omapfb-main.c
@@ -1391,9 +1391,6 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
 
 	size = PAGE_ALIGN(size);
 
-	WARN_ONCE(paddr,
-		"reserving memory at predefined address not supported\n");
-
 	dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs);
 
 	if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
@@ -1521,6 +1518,9 @@ static int omapfb_parse_vram_param(const char *param, int max_entries,
 
 		}
 
+		WARN_ONCE(paddr,
+			"reserving memory at predefined address not supported\n");
+
 		paddrs[fbnum] = paddr;
 		sizes[fbnum] = size;