From dcca023fa8039e37d564b768321c7db701b2ccde Mon Sep 17 00:00:00 2001
From: Masanari Iida <standby24x7@gmail.com>
Date: Mon, 6 Feb 2012 23:16:44 +0900
Subject: [PATCH] --- yaml --- r: 291711 b: refs/heads/master c:
 6bd1d5867abfd3675cf17a8c46f2425bcf844804 h: refs/heads/master i:   291709:
 91249046963caf73398d7b420c99bbc7b99e76d3   291707:
 4f7858cc50ccbf1bfa0eaec9c5086d94e4340779   291703:
 b0e120493ca6012f80971fe3b4fd453e2d928ac5   291695:
 da32c3b8ca61c2f6ceea5878e3813bbbe49aab3a   291679:
 846158aac74591e70deeac259e9e51af7aad55b8   291647:
 5b6ef36364c73d1a3d140425554bc3290e03518d   291583:
 9390fb303b48a7332263115783095442eec30c11 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/mach-omap1/lcd_dma.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index affc2cd7841d..d144cc629c2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 481e6283bbccc20a3a7e6a8e50f9562a20e9b45d
+refs/heads/master: 6bd1d5867abfd3675cf17a8c46f2425bcf844804
diff --git a/trunk/arch/arm/mach-omap1/lcd_dma.c b/trunk/arch/arm/mach-omap1/lcd_dma.c
index 453809359ba6..4c5ce7d829c2 100644
--- a/trunk/arch/arm/mach-omap1/lcd_dma.c
+++ b/trunk/arch/arm/mach-omap1/lcd_dma.c
@@ -117,7 +117,7 @@ EXPORT_SYMBOL(omap_set_lcd_dma_b1_mirror);
 void omap_set_lcd_dma_b1_vxres(unsigned long vxres)
 {
 	if (cpu_is_omap15xx()) {
-		printk(KERN_ERR "DMA virtual resulotion is not supported "
+		printk(KERN_ERR "DMA virtual resolution is not supported "
 				"in 1510 mode\n");
 		BUG();
 	}