staging: sm7xxfb: sm7xx becomes sm7xxfb

Rename sm7xx driver to sm7xxfb. Fix Kconfig and Makefile to fit the new
change.

Changes are coherent with the rest of stable framebuffer drivers. TODO
updated.

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 05e33c700750767c3e5455be7dfac45a652acb17..38f1fb08eaef4f81cf0a8effa8726ae1f572ab7e 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/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/drivers/staging/Makefile b/drivers/staging/Makefile
index a987b3ad380be083ea133ce77db0538cd212f787..e0c4c2444fedb72e935b3dcf2b562d0a6816c7b2 100644 (file)
--- a/drivers/staging/Makefile
+++ b/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/drivers/staging/sm7xx/Makefile b/drivers/staging/sm7xx/Makefile
deleted file mode 100644 (file)
index f43cb91..0000000
--- a/drivers/staging/sm7xx/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-$(CONFIG_FB_SM7XX) += sm7xx.o
-
-sm7xx-y := smtcfb.o

diff --git a/drivers/staging/sm7xx/Kconfig b/drivers/staging/sm7xxfb/Kconfig
similarity index 85%
rename from drivers/staging/sm7xx/Kconfig
rename to drivers/staging/sm7xxfb/Kconfig
index 323964f5b1a9af7e3e4c6fd03f04b7e288068739..d5013f8a865b2b92f56141a239e0c23e150355d0 100644 (file)
--- a/drivers/staging/sm7xx/Kconfig
+++ b/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/drivers/staging/sm7xxfb/Makefile b/drivers/staging/sm7xxfb/Makefile
new file mode 100644 (file)
index 0000000..48f471c
--- /dev/null
+++ b/drivers/staging/sm7xxfb/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_FB_SM7XX) += sm7xxfb.o

diff --git a/drivers/staging/sm7xx/TODO b/drivers/staging/sm7xxfb/TODO
similarity index 76%
rename from drivers/staging/sm7xx/TODO
rename to drivers/staging/sm7xxfb/TODO
index 7304021368c3ad09cd1ffc5e94ac52c4ac64bd88..1fcead591c16f6e6f02933d3c9060501538cf534 100644 (file)
--- a/drivers/staging/sm7xx/TODO
+++ b/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/drivers/staging/sm7xx/smtcfb.h b/drivers/staging/sm7xxfb/sm7xx.h
similarity index 100%
rename from drivers/staging/sm7xx/smtcfb.h
rename to drivers/staging/sm7xxfb/sm7xx.h

diff --git a/drivers/staging/sm7xx/smtcfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c
similarity index 99%
rename from drivers/staging/sm7xx/smtcfb.c
rename to drivers/staging/sm7xxfb/sm7xxfb.c
index e7028a312ce1f7a56faca560f61316b55d0190d6..21dab346253a2a29a7131473214362e5429dc21e 100644 (file)
--- a/drivers/staging/sm7xx/smtcfb.c
+++ b/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;