aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-12-27 16:17:12 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 05:17:15 -0500
commit2d5ca76f2b39a31313d7e54224c78b7b311e7dce (patch)
tree11f7b3a7c9864ac01b64ef027a756679792f8c97
parent0170f6bcb243cb9e86c953652f8e62fccb8108f1 (diff)
[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>
-rw-r--r--drivers/media/Kconfig22
-rw-r--r--drivers/media/video/Makefile1
-rw-r--r--drivers/staging/Kconfig2
-rw-r--r--drivers/staging/Makefile1
-rw-r--r--drivers/staging/dabusb/Kconfig14
-rw-r--r--drivers/staging/dabusb/Makefile2
-rw-r--r--drivers/staging/dabusb/TODO5
-rw-r--r--drivers/staging/dabusb/dabusb.c (renamed from drivers/media/video/dabusb.c)0
-rw-r--r--drivers/staging/dabusb/dabusb.h (renamed from drivers/media/video/dabusb.h)0
9 files changed, 24 insertions, 23 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 147c92b9b4f6..81b3ba83cc65 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -92,26 +92,4 @@ source "drivers/media/radio/Kconfig"
92 92
93source "drivers/media/dvb/Kconfig" 93source "drivers/media/dvb/Kconfig"
94 94
95config DAB
96 boolean "DAB adapters"
97 ---help---
98 Allow selecting support for Digital Audio Broadcasting (DAB)
99 Receiver adapters.
100
101if DAB
102config USB_DABUSB
103 tristate "DABUSB driver"
104 depends on USB
105 ---help---
106 A Digital Audio Broadcasting (DAB) Receiver for USB and Linux
107 brought to you by the DAB-Team
108 <http://wwwbode.cs.tum.edu/Par/arch/dab/>. This driver can be taken
109 as an example for URB-based bulk, control, and isochronous
110 transactions. URB's are explained in
111 <Documentation/usb/URB.txt>.
112
113 To compile this driver as a module, choose M here: the
114 module will be called dabusb.
115endif # DAB
116
117endif # MEDIA_SUPPORT 95endif # MEDIA_SUPPORT
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index fd684dd4f91c..98825e7d8ca4 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -121,7 +121,6 @@ obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o
121 121
122obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o 122obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
123 123
124obj-$(CONFIG_USB_DABUSB) += dabusb.o
125obj-$(CONFIG_USB_ZR364XX) += zr364xx.o 124obj-$(CONFIG_USB_ZR364XX) += zr364xx.o
126obj-$(CONFIG_USB_STKWEBCAM) += stkwebcam.o 125obj-$(CONFIG_USB_STKWEBCAM) += stkwebcam.o
127 126
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 7e7b27b3ddb0..648142e6de64 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -51,6 +51,8 @@ source "drivers/staging/cx25821/Kconfig"
51 51
52source "drivers/staging/tm6000/Kconfig" 52source "drivers/staging/tm6000/Kconfig"
53 53
54source "drivers/staging/dabusb/Kconfig"
55
54source "drivers/staging/se401/Kconfig" 56source "drivers/staging/se401/Kconfig"
55 57
56source "drivers/staging/usbvideo/Kconfig" 58source "drivers/staging/usbvideo/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 72e0c839ea34..8185c00cefc1 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_SLICOSS) += slicoss/
8obj-$(CONFIG_VIDEO_GO7007) += go7007/ 8obj-$(CONFIG_VIDEO_GO7007) += go7007/
9obj-$(CONFIG_VIDEO_CX25821) += cx25821/ 9obj-$(CONFIG_VIDEO_CX25821) += cx25821/
10obj-$(CONFIG_VIDEO_TM6000) += tm6000/ 10obj-$(CONFIG_VIDEO_TM6000) += tm6000/
11obj-$(CONFIG_USB_DABUSB) += dabusb/
11obj-$(CONFIG_USB_VICAM) += usbvideo/ 12obj-$(CONFIG_USB_VICAM) += usbvideo/
12obj-$(CONFIG_USB_SE401) += se401/ 13obj-$(CONFIG_USB_SE401) += se401/
13obj-$(CONFIG_LIRC_STAGING) += lirc/ 14obj-$(CONFIG_LIRC_STAGING) += lirc/
diff --git a/drivers/staging/dabusb/Kconfig b/drivers/staging/dabusb/Kconfig
new file mode 100644
index 000000000000..87bdc425d3c5
--- /dev/null
+++ b/drivers/staging/dabusb/Kconfig
@@ -0,0 +1,14 @@
1config USB_DABUSB
2 tristate "DABUSB driver"
3 depends on USB
4 ---help---
5 A Digital Audio Broadcasting (DAB) Receiver for USB and Linux
6 brought to you by the DAB-Team
7 <http://wwwbode.cs.tum.edu/Par/arch/dab/>. This driver can be taken
8 as an example for URB-based bulk, control, and isochronous
9 transactions. URB's are explained in
10 <Documentation/usb/URB.txt>.
11
12 To compile this driver as a module, choose M here: the
13 module will be called dabusb.
14
diff --git a/drivers/staging/dabusb/Makefile b/drivers/staging/dabusb/Makefile
new file mode 100644
index 000000000000..2ff2f228e5f9
--- /dev/null
+++ b/drivers/staging/dabusb/Makefile
@@ -0,0 +1,2 @@
1obj-$(CONFIG_USB_DABUSB) += dabusb.o
2
diff --git a/drivers/staging/dabusb/TODO b/drivers/staging/dabusb/TODO
new file mode 100644
index 000000000000..f9c0314ea0c1
--- /dev/null
+++ b/drivers/staging/dabusb/TODO
@@ -0,0 +1,5 @@
1This is a driver for an experimental sample developed in 2003. The driver
2never supported any commercial product, nor had any known user.
3If nobody takes care on it, the driver will be removed for 2.6.39.
4
5Please send patches to linux-media@vger.kernel.org
diff --git a/drivers/media/video/dabusb.c b/drivers/staging/dabusb/dabusb.c
index f3e25e91366d..f3e25e91366d 100644
--- a/drivers/media/video/dabusb.c
+++ b/drivers/staging/dabusb/dabusb.c
diff --git a/drivers/media/video/dabusb.h b/drivers/staging/dabusb/dabusb.h
index 00eb34c863eb..00eb34c863eb 100644
--- a/drivers/media/video/dabusb.h
+++ b/drivers/staging/dabusb/dabusb.h