---

yaml --- r: 317293 b: refs/heads/master c: 925aa66 h: refs/heads/master i: 317291: 2698ae4 v: v3
git-mirror · Jun 12, 2012 · f53bc4f · f53bc4f
1 parent 9d0f715
commit f53bc4f
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0beb30d365b0fb36c9cac7b7dbe980e882378f23
+refs/heads/master: 925aa6600cee015b694cb5fe2a9c667e0d9a68c6
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -84,7 +84,7 @@ source "drivers/staging/wlags49_h2/Kconfig"
 
 source "drivers/staging/wlags49_h25/Kconfig"
 
-source "drivers/staging/sm7xx/Kconfig"
+source "drivers/staging/sm7xxfb/Kconfig"
 
 source "drivers/staging/crystalhd/Kconfig"
 

diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -37,7 +37,7 @@ obj-$(CONFIG_ZCACHE)		+= zcache/
 obj-$(CONFIG_ZSMALLOC)		+= zsmalloc/
 obj-$(CONFIG_WLAGS49_H2)	+= wlags49_h2/
 obj-$(CONFIG_WLAGS49_H25)	+= wlags49_h25/
-obj-$(CONFIG_FB_SM7XX)		+= sm7xx/
+obj-$(CONFIG_FB_SM7XX)		+= sm7xxfb/
 obj-$(CONFIG_CRYSTALHD)		+= crystalhd/
 obj-$(CONFIG_CXT1E1)		+= cxt1e1/
 obj-$(CONFIG_FB_XGI)		+= xgifb/

diff --git a/trunk/drivers/staging/sm7xx/Makefile b/trunk/drivers/staging/sm7xx/Makefile
diff --git a/trunk/drivers/staging/sm7xx/Kconfig → trunk/drivers/staging/sm7xxfb/Kconfig b/trunk/drivers/staging/sm7xx/Kconfig → trunk/drivers/staging/sm7xxfb/Kconfig
@@ -9,5 +9,5 @@ config FB_SM7XX
 	  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
+	  called sm7xxfb. 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/sm7xxfb/Makefile b/trunk/drivers/staging/sm7xxfb/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_FB_SM7XX) += sm7xxfb.o
diff --git a/trunk/drivers/staging/sm7xx/TODO → trunk/drivers/staging/sm7xxfb/TODO b/trunk/drivers/staging/sm7xx/TODO → trunk/drivers/staging/sm7xxfb/TODO
@@ -3,7 +3,7 @@ TODO:
 - 2D acceleration support
 - use kernel coding style
 - refine the code and remove unused code
-- move it to drivers/video/sm7xx/ or make it be drivers/video/sm7xxfb.c
+- move it to drivers/video/sm7xxfb.c
 
 Please send any patches to Greg Kroah-Hartman <greg@kroah.com> and
 Teddy Wang <teddy.wang@siliconmotion.com.cn>.
diff --git a/trunk/drivers/staging/sm7xx/smtcfb.h → trunk/drivers/staging/sm7xxfb/sm7xx.h b/trunk/drivers/staging/sm7xx/smtcfb.h → trunk/drivers/staging/sm7xxfb/sm7xx.h
diff --git a/trunk/drivers/staging/sm7xx/smtcfb.c → trunk/drivers/staging/sm7xxfb/sm7xxfb.c b/trunk/drivers/staging/sm7xx/smtcfb.c → trunk/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -32,7 +32,7 @@
 #include <linux/pm.h>
 #endif
 
-#include "smtcfb.h"
+#include "sm7xx.h"
 
 struct screen_info smtc_screen_info;