From 61988448e31f03cb995bb301720afaaa72e252bf Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 25 Oct 2010 19:44:27 -0700
Subject: [PATCH] --- yaml --- r: 221010 b: refs/heads/master c:
 17f52ed7358dc54e5534f9ad495e90306c68cfcf h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/video/msm/mddi.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 32481b3137f7..4b98b086513d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d601c795c41c0016790ff1a92f2307fd4ff29791
+refs/heads/master: 17f52ed7358dc54e5534f9ad495e90306c68cfcf
diff --git a/trunk/drivers/video/msm/mddi.c b/trunk/drivers/video/msm/mddi.c
index 7c316c34dfca..b66d86ac7cea 100644
--- a/trunk/drivers/video/msm/mddi.c
+++ b/trunk/drivers/video/msm/mddi.c
@@ -318,7 +318,7 @@ static long mddi_wait_interrupt_timeout(struct mddi_info *mddi,
 static void mddi_wait_interrupt(struct mddi_info *mddi, uint32_t intmask)
 {
 	if (mddi_wait_interrupt_timeout(mddi, intmask, HZ/10) == 0)
-		printk(KERN_INFO KERN_ERR "mddi_wait_interrupt %d, timeout "
+		printk(KERN_INFO "mddi_wait_interrupt %d, timeout "
 		       "waiting for %x, INT = %x, STAT = %x gotint = %x\n",
 		       current->pid, intmask, mddi_readl(INT), mddi_readl(STAT),
 		       mddi->got_int);
@@ -465,8 +465,7 @@ static int __init mddi_get_client_caps(struct mddi_info *mddi)
 
 		if (mddi->flags & FLAG_HAVE_CAPS)
 			break;
-		printk(KERN_INFO KERN_ERR "mddi_init, timeout waiting for "
-				"caps\n");
+		printk(KERN_INFO "mddi_init, timeout waiting for caps\n");
 	}
 	return mddi->flags & FLAG_HAVE_CAPS;
 }