From dda428f8672f8ab23ee5e5eea44e82ba91e96f9c Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Mon, 10 Jan 2011 09:47:41 -0200
Subject: [PATCH] --- yaml --- r: 230506 b: refs/heads/master c:
 e3d5fb71e228c22ee1f78f19f19ef4e07f48f076 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/Kconfig | 2 +-
 trunk/drivers/video/imxfb.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5b4ef98b23c5..9f94cb90204e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec03031707a348578c6ded277e5d92eb21de4fce
+refs/heads/master: e3d5fb71e228c22ee1f78f19f19ef4e07f48f076
diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig
index c183faace63a..0a96a60bbe49 100644
--- a/trunk/drivers/video/Kconfig
+++ b/trunk/drivers/video/Kconfig
@@ -414,7 +414,7 @@ config FB_SA1100
 	  Y here.
 
 config FB_IMX
-	tristate "Motorola i.MX LCD support"
+	tristate "Freescale i.MX LCD support"
 	depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2)
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
diff --git a/trunk/drivers/video/imxfb.c b/trunk/drivers/video/imxfb.c
index 1ab2c2588675..69bd4a581d4a 100644
--- a/trunk/drivers/video/imxfb.c
+++ b/trunk/drivers/video/imxfb.c
@@ -974,6 +974,6 @@ static void __exit imxfb_cleanup(void)
 module_init(imxfb_init);
 module_exit(imxfb_cleanup);
 
-MODULE_DESCRIPTION("Motorola i.MX framebuffer driver");
+MODULE_DESCRIPTION("Freescale i.MX framebuffer driver");
 MODULE_AUTHOR("Sascha Hauer, Pengutronix");
 MODULE_LICENSE("GPL");