diff options
| -rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/sm7xx/Makefile | 3 | ||||
| -rw-r--r-- | drivers/staging/sm7xxfb/Kconfig (renamed from drivers/staging/sm7xx/Kconfig) | 2 | ||||
| -rw-r--r-- | drivers/staging/sm7xxfb/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/sm7xxfb/TODO (renamed from drivers/staging/sm7xx/TODO) | 2 | ||||
| -rw-r--r-- | drivers/staging/sm7xxfb/sm7xx.h (renamed from drivers/staging/sm7xx/smtcfb.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/sm7xxfb/sm7xxfb.c (renamed from drivers/staging/sm7xx/smtcfb.c) | 2 |
8 files changed, 6 insertions, 8 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 05e33c700750..38f1fb08eaef 100644 --- 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 a987b3ad380b..e0c4c2444fed 100644 --- 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 index f43cb9106305..000000000000 --- 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 index 323964f5b1a9..d5013f8a865b 100644 --- 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 index 000000000000..48f471cf9f36 --- /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 index 7304021368c3..1fcead591c16 100644 --- 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 index 43d86f873410..43d86f873410 100644 --- a/drivers/staging/sm7xx/smtcfb.h +++ b/drivers/staging/sm7xxfb/sm7xx.h diff --git a/drivers/staging/sm7xx/smtcfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c index e7028a312ce1..21dab346253a 100644 --- 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; |
