[media] dabusb: Move it to staging to be deprecated

dabusb driver were conceived as an experimental driver for a test
device. The driver never supported any shipped product, and, while
there were some updates on it in 2003, for an ancient product,
those changes were never submitted upstream.

Also, there's no DocBook for its API, nor any upstream discussion.

So, better to remove it, on .39. If later needed, we may rescue it
from git logs. For now, let's move it to staging.

Acked-by: Deti Fliegl <deti@fliegl.de>
Cc: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 147c92b9b4f64fc15a02e75607d9bfc80e83344a..81b3ba83cc6558c0016042b33eb5feb694d8b66f 100644 (file)
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -92,26 +92,4 @@ source "drivers/media/radio/Kconfig"
 
 source "drivers/media/dvb/Kconfig"
 
-config DAB
-       boolean "DAB adapters"
-       ---help---
-         Allow selecting support for Digital Audio Broadcasting (DAB)
-         Receiver adapters.
-
-if DAB
-config USB_DABUSB
-       tristate "DABUSB driver"
-       depends on USB
-       ---help---
-         A Digital Audio Broadcasting (DAB) Receiver for USB and Linux
-         brought to you by the DAB-Team
-         <http://wwwbode.cs.tum.edu/Par/arch/dab/>.  This driver can be taken
-         as an example for URB-based bulk, control, and isochronous
-         transactions. URB's are explained in
-         <Documentation/usb/URB.txt>.
-
-         To compile this driver as a module, choose M here: the
-         module will be called dabusb.
-endif # DAB
-
 endif # MEDIA_SUPPORT

diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index fd684dd4f91cd8a8b000fced61db551641dc7c84..98825e7d8ca4ac923cc7b394d2cde77f1b1de726 100644 (file)
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -121,7 +121,6 @@ obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o
 
 obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
 
-obj-$(CONFIG_USB_DABUSB)        += dabusb.o
 obj-$(CONFIG_USB_ZR364XX)       += zr364xx.o
 obj-$(CONFIG_USB_STKWEBCAM)     += stkwebcam.o
 

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 7e7b27b3ddb02e7da36f123b7e381588d7e29a26..648142e6de64008730b6a59047cc6adcf84930ed 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -51,6 +51,8 @@ source "drivers/staging/cx25821/Kconfig"
 
 source "drivers/staging/tm6000/Kconfig"
 
+source "drivers/staging/dabusb/Kconfig"
+
 source "drivers/staging/se401/Kconfig"
 
 source "drivers/staging/usbvideo/Kconfig"

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 72e0c839ea349614c71e0d43b1b03324cbb9af5a..8185c00cefc1c0dcc6e3926aca2f95ea08c0359b 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_SLICOSS)           += slicoss/
 obj-$(CONFIG_VIDEO_GO7007)     += go7007/
 obj-$(CONFIG_VIDEO_CX25821)    += cx25821/
 obj-$(CONFIG_VIDEO_TM6000)     += tm6000/
+obj-$(CONFIG_USB_DABUSB)        += dabusb/
 obj-$(CONFIG_USB_VICAM)         += usbvideo/
 obj-$(CONFIG_USB_SE401)         += se401/
 obj-$(CONFIG_LIRC_STAGING)     += lirc/

diff --git a/drivers/staging/dabusb/Kconfig b/drivers/staging/dabusb/Kconfig
new file mode 100644 (file)
index 0000000..87bdc42
--- /dev/null
+++ b/drivers/staging/dabusb/Kconfig
@@ -0,0 +1,14 @@
+config USB_DABUSB
+       tristate "DABUSB driver"
+       depends on USB
+       ---help---
+         A Digital Audio Broadcasting (DAB) Receiver for USB and Linux
+         brought to you by the DAB-Team
+         <http://wwwbode.cs.tum.edu/Par/arch/dab/>.  This driver can be taken
+         as an example for URB-based bulk, control, and isochronous
+         transactions. URB's are explained in
+         <Documentation/usb/URB.txt>.
+
+         To compile this driver as a module, choose M here: the
+         module will be called dabusb.
+

diff --git a/drivers/staging/dabusb/Makefile b/drivers/staging/dabusb/Makefile
new file mode 100644 (file)
index 0000000..2ff2f22
--- /dev/null
+++ b/drivers/staging/dabusb/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_USB_DABUSB)        += dabusb.o
+

diff --git a/drivers/staging/dabusb/TODO b/drivers/staging/dabusb/TODO
new file mode 100644 (file)
index 0000000..f9c0314
--- /dev/null
+++ b/drivers/staging/dabusb/TODO
@@ -0,0 +1,5 @@
+This is a driver for an experimental sample developed in 2003. The driver
+never supported any commercial product, nor had any known user.
+If nobody takes care on it, the driver will be removed for 2.6.39.
+
+Please send patches to linux-media@vger.kernel.org

diff --git a/drivers/media/video/dabusb.c b/drivers/staging/dabusb/dabusb.c
similarity index 100%
rename from drivers/media/video/dabusb.c
rename to drivers/staging/dabusb/dabusb.c

diff --git a/drivers/media/video/dabusb.h b/drivers/staging/dabusb/dabusb.h
similarity index 100%
rename from drivers/media/video/dabusb.h
rename to drivers/staging/dabusb/dabusb.h