staging: sm7xxfb: merge sm712fb with fbdev
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>
Fri, 7 Aug 2015 13:01:13 +0000 (18:31 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Aug 2015 22:05:01 +0000 (15:05 -0700)
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>
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/sm7xxfb/Kconfig [deleted file]
drivers/staging/sm7xxfb/Makefile [deleted file]
drivers/staging/sm7xxfb/TODO [deleted file]
drivers/video/fbdev/Kconfig
drivers/video/fbdev/Makefile
drivers/video/fbdev/sm712.h [moved from drivers/staging/sm7xxfb/sm7xx.h with 100% similarity]
drivers/video/fbdev/sm712fb.c [moved from drivers/staging/sm7xxfb/sm7xxfb.c with 99% similarity]

Simple merge
Simple merge
diff --cc drivers/staging/sm7xxfb/Kconfig
Simple merge
diff --cc drivers/staging/sm7xxfb/Makefile
Simple merge
diff --cc drivers/staging/sm7xxfb/TODO
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge