fbdev: move udlfb out of staging.
Paul Mundt [Tue, 16 Nov 2010 05:00:24 +0000 (14:00 +0900)]
udlfb has undergone a fair bit of cleanup recently and is effectively at
the point where it can be liberated from staging purgatory and promoted
to a real driver.

The outstanding cleanups are all minor, with some of them dependent on
drivers/video headers, so these will be done incrementally from udlfb's
new home.

Requested-by: Bernie Thompson <bernie@plugable.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Documentation/fb/udlfb.txt [moved from drivers/staging/udlfb/udlfb.txt with 100% similarity]
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/udlfb/Kconfig [deleted file]
drivers/staging/udlfb/Makefile [deleted file]
drivers/video/Kconfig
drivers/video/Makefile
drivers/video/udlfb.c [moved from drivers/staging/udlfb/udlfb.c with 99% similarity]
include/video/udlfb.h [moved from drivers/staging/udlfb/udlfb.h with 100% similarity]

index 5eafdf4..df31a72 100644 (file)
@@ -111,8 +111,6 @@ source "drivers/staging/vt6655/Kconfig"
 
 source "drivers/staging/vt6656/Kconfig"
 
-source "drivers/staging/udlfb/Kconfig"
-
 source "drivers/staging/hv/Kconfig"
 
 source "drivers/staging/vme/Kconfig"
index a97a955..7a15c0c 100644 (file)
@@ -38,7 +38,6 @@ obj-$(CONFIG_USB_SERIAL_QUATECH_USB2) += quatech_usb2/
 obj-$(CONFIG_OCTEON_ETHERNET)  += octeon/
 obj-$(CONFIG_VT6655)           += vt6655/
 obj-$(CONFIG_VT6656)           += vt6656/
-obj-$(CONFIG_FB_UDL)           += udlfb/
 obj-$(CONFIG_HYPERV)           += hv/
 obj-$(CONFIG_VME_BUS)          += vme/
 obj-$(CONFIG_MRST_RAR_HANDLER) += memrar/
diff --git a/drivers/staging/udlfb/Kconfig b/drivers/staging/udlfb/Kconfig
deleted file mode 100644 (file)
index 65bd5db..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-config FB_UDL
-       tristate "Displaylink USB Framebuffer support"
-       depends on FB && USB
-       select FB_MODE_HELPERS
-       select FB_SYS_FILLRECT
-       select FB_SYS_COPYAREA
-       select FB_SYS_IMAGEBLIT
-       select FB_SYS_FOPS
-       select FB_DEFERRED_IO
-       ---help---
-         This is a kernel framebuffer driver for DisplayLink USB devices.
-         Supports fbdev clients like xf86-video-fbdev, kdrive, fbi, and
-         mplayer -vo fbdev. Supports all USB 2.0 era DisplayLink devices.
-         To compile as a module, choose M here: the module name is udlfb.
diff --git a/drivers/staging/udlfb/Makefile b/drivers/staging/udlfb/Makefile
deleted file mode 100644 (file)
index 30d9e67..0000000
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_FB_UDL)           += udlfb.o
index 27c1fb4..37771d0 100644 (file)
@@ -2034,6 +2034,20 @@ config FB_SM501
 
          If unsure, say N.
 
+config FB_UDL
+       tristate "Displaylink USB Framebuffer support"
+       depends on FB && USB
+       select FB_MODE_HELPERS
+       select FB_SYS_FILLRECT
+       select FB_SYS_COPYAREA
+       select FB_SYS_IMAGEBLIT
+       select FB_SYS_FOPS
+       select FB_DEFERRED_IO
+       ---help---
+         This is a kernel framebuffer driver for DisplayLink USB devices.
+         Supports fbdev clients like xf86-video-fbdev, kdrive, fbi, and
+         mplayer -vo fbdev. Supports all USB 2.0 era DisplayLink devices.
+         To compile as a module, choose M here: the module name is udlfb.
 
 config FB_PNX4008_DUM
        tristate "Display Update Module support on Philips PNX4008 board"
index 485e8ed..03678e3 100644 (file)
@@ -122,6 +122,7 @@ obj-$(CONFIG_FB_PNX4008_DUM_RGB)  += pnx4008/
 obj-$(CONFIG_FB_IBM_GXT4500)     += gxt4500.o
 obj-$(CONFIG_FB_PS3)             += ps3fb.o
 obj-$(CONFIG_FB_SM501)            += sm501fb.o
+obj-$(CONFIG_FB_UDL)             += udlfb.o
 obj-$(CONFIG_FB_XILINX)           += xilinxfb.o
 obj-$(CONFIG_SH_MIPI_DSI)        += sh_mipi_dsi.o
 obj-$(CONFIG_FB_SH_MOBILE_HDMI)          += sh_mobile_hdmi.o
similarity index 99%
rename from drivers/staging/udlfb/udlfb.c
rename to drivers/video/udlfb.c
index fed2510..0cca487 100644 (file)
@@ -26,8 +26,7 @@
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
-
-#include "udlfb.h"
+#include <video/udlfb.h>
 
 static struct fb_fix_screeninfo dlfb_fix = {
        .id =           "udlfb",