From 9d0f71536d82f35488c1e305ca591f01991a4dc0 Mon Sep 17 00:00:00 2001
From: "Javier M. Mellid" <jmunhoz@igalia.com>
Date: Sun, 10 Jun 2012 13:12:23 +0200
Subject: [PATCH] --- yaml --- r: 317292 b: refs/heads/master c:
 0beb30d365b0fb36c9cac7b7dbe980e882378f23 h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/staging/sm7xx/Kconfig  |  9 +++++++--
 trunk/drivers/staging/sm7xx/smtcfb.c | 10 +++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 4e6e0e4108a3..4501327d1bb8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67c4e9f46b5241ff777ced09e29048363de8703f
+refs/heads/master: 0beb30d365b0fb36c9cac7b7dbe980e882378f23
diff --git a/trunk/drivers/staging/sm7xx/Kconfig b/trunk/drivers/staging/sm7xx/Kconfig
index 315102c7fed1..323964f5b1a9 100644
--- a/trunk/drivers/staging/sm7xx/Kconfig
+++ b/trunk/drivers/staging/sm7xx/Kconfig
@@ -1,8 +1,13 @@
 config FB_SM7XX
-	tristate "Silicon Motion SM7XX Frame Buffer Support"
+	tristate "Silicon Motion SM7XX framebuffer support"
 	depends on FB
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
 	help
-	  Frame Buffer driver for the Silicon Motion SM7XX serial graphic card.
+	  Frame buffer driver for the Silicon Motion SM710, SM712, SM721
+	  and SM722 chips.
+
+	  This driver is also available as a module. The module will be
+	  called sm7xx. If you want to compile it as a module, say M
+	  here and read <file:Documentation/kbuild/modules.txt>.
diff --git a/trunk/drivers/staging/sm7xx/smtcfb.c b/trunk/drivers/staging/sm7xx/smtcfb.c
index 2c172d6cd65f..e7028a312ce1 100644
--- a/trunk/drivers/staging/sm7xx/smtcfb.c
+++ b/trunk/drivers/staging/sm7xx/smtcfb.c
@@ -15,6 +15,7 @@
  * License. See the file COPYING in the main directory of this archive for
  * more details.
  *
+ * Framebuffer driver for Silicon Motion SM710, SM712, SM721 and SM722 chips
  */
 
 #include <linux/io.h>
@@ -758,7 +759,7 @@ static void smtc_unmap_smem(struct smtcfb_info *sfb)
 }
 
 /*
- * We need to wake up the LynxEM+, and make sure its in linear memory mode.
+ * We need to wake up the device and make sure its in linear memory mode.
  */
 static inline void sm7xx_init_hw(void)
 {
@@ -963,7 +964,11 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
 	return err;
 }
 
-
+/*
+ * 0x710 (LynxEM)
+ * 0x712 (LynxEM+)
+ * 0x720 (Lynx3DM, Lynx3DM+)
+ */
 static DEFINE_PCI_DEVICE_TABLE(smtcfb_pci_table) = {
 	{ PCI_DEVICE(0x126f, 0x710), },
 	{ PCI_DEVICE(0x126f, 0x712), },
@@ -971,7 +976,6 @@ static DEFINE_PCI_DEVICE_TABLE(smtcfb_pci_table) = {
 	{0,}
 };
 
-
 static void __devexit smtcfb_pci_remove(struct pci_dev *pdev)
 {
 	struct smtcfb_info *sfb;