Commit ca9c20ce authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'fbdev/udlfb'

parents 17ca20cb 81f6f3c1

drivers/staging/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -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"

drivers/staging/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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/

drivers/staging/udlfb/Kconfig

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
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.

drivers/staging/udlfb/Makefile

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_FB_UDL)		+= udlfb.o