tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

staging: sm7xxfb: merge sm712fb with fbdev

Now since all cleanups are done and the code is ready to be merged lets
move it out of staging into fbdev location.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Sudip Mukherjee and committed by
Greg Kroah-Hartman 1461d667 b96e53df

+16 -30
-2
drivers/staging/Kconfig
··· 56 56 57 57 source "drivers/staging/iio/Kconfig" 58 58 59 - source "drivers/staging/sm7xxfb/Kconfig" 60 - 61 59 source "drivers/staging/sm750fb/Kconfig" 62 60 63 61 source "drivers/staging/xgifb/Kconfig"
-1
drivers/staging/Makefile
··· 22 22 obj-$(CONFIG_VT6656) += vt6656/ 23 23 obj-$(CONFIG_VME_BUS) += vme/ 24 24 obj-$(CONFIG_IIO) += iio/ 25 - obj-$(CONFIG_FB_SM7XX) += sm7xxfb/ 26 25 obj-$(CONFIG_FB_SM750) += sm750fb/ 27 26 obj-$(CONFIG_FB_XGI) += xgifb/ 28 27 obj-$(CONFIG_USB_EMXX) += emxx_udc/
-13
drivers/staging/sm7xxfb/Kconfig
··· 1 - config FB_SM7XX 2 - tristate "Silicon Motion SM7XX framebuffer support" 3 - depends on FB && PCI 4 - select FB_CFB_FILLRECT 5 - select FB_CFB_COPYAREA 6 - select FB_CFB_IMAGEBLIT 7 - help 8 - Frame buffer driver for the Silicon Motion SM710, SM712, SM721 9 - and SM722 chips. 10 - 11 - This driver is also available as a module. The module will be 12 - called sm7xxfb. If you want to compile it as a module, say M 13 - here and read <file:Documentation/kbuild/modules.txt>.
-1
drivers/staging/sm7xxfb/Makefile
··· 1 - obj-$(CONFIG_FB_SM7XX) += sm7xxfb.o
-12
drivers/staging/sm7xxfb/TODO
··· 1 - TODO: 2 - - Dual head support 3 - - 2D acceleration support 4 - - use kernel coding style 5 - - refine the code and remove unused code 6 - - move it to drivers/video/fbdev/sm7xxfb.c 7 - 8 - Please send any patches to 9 - Greg Kroah-Hartman <greg@kroah.com> 10 - Sudip Mukherjee <sudipm.mukherjee@gmail.com> 11 - Teddy Wang <teddy.wang@siliconmotion.com> 12 - Sudip Mukherjee <sudip@vectorindia.org>
drivers/staging/sm7xxfb/sm7xx.h drivers/video/fbdev/sm712.h
+1 -1
drivers/staging/sm7xxfb/sm7xxfb.c drivers/video/fbdev/sm712fb.c
··· 32 32 #include <linux/pm.h> 33 33 #endif 34 34 35 - #include "sm7xx.h" 35 + #include "sm712.h" 36 36 37 37 /* 38 38 * Private structure
+14
drivers/video/fbdev/Kconfig
··· 2475 2475 help 2476 2476 This driver implements support for the Solomon SSD1307 2477 2477 OLED controller over I2C. 2478 + 2479 + config FB_SM712 2480 + tristate "Silicon Motion SM712 framebuffer support" 2481 + depends on FB && PCI 2482 + select FB_CFB_FILLRECT 2483 + select FB_CFB_COPYAREA 2484 + select FB_CFB_IMAGEBLIT 2485 + help 2486 + Frame buffer driver for the Silicon Motion SM710, SM712, SM721 2487 + and SM722 chips. 2488 + 2489 + This driver is also available as a module. The module will be 2490 + called sm712fb. If you want to compile it as a module, say M 2491 + here and read <file:Documentation/kbuild/modules.txt>.
+1
drivers/video/fbdev/Makefile
··· 131 131 obj-$(CONFIG_FB_PUV3_UNIGFX) += fb-puv3.o 132 132 obj-$(CONFIG_FB_HYPERV) += hyperv_fb.o 133 133 obj-$(CONFIG_FB_OPENCORES) += ocfb.o 134 + obj-$(CONFIG_FB_SM712) += sm712fb.o 134 135 135 136 # Platform or fallback drivers go here 136 137 obj-$(CONFIG_FB_UVESA) += uvesafb.o