aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2006-11-19 18:07:26 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2006-12-07 17:05:12 -0500
commit861646f52217cf42a0e2e6558d85bd1172ca1611 (patch)
treea710170a5bf64ca4d6666e9bd645b84b71cecb1d
parent9868e0ec03fd4ac9cb3943e5dae0ad6a14faa5ff (diff)
ieee1394: dv1394: schedule for feature removal
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
-rw-r--r--Documentation/feature-removal-schedule.txt11
-rw-r--r--drivers/ieee1394/Kconfig13
-rw-r--r--drivers/ieee1394/dv1394.c4
3 files changed, 19 insertions, 9 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 3fef3444c761..c8c6daeefed0 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -39,6 +39,17 @@ Who: Dan Dennedy <dan@dennedy.org>, Stefan Richter <stefanr@s5r6.in-berlin.de>
39 39
40--------------------------- 40---------------------------
41 41
42What: dv1394 driver (CONFIG_IEEE1394_DV1394)
43When: June 2007
44Why: Replaced by raw1394 + userspace libraries, notably libiec61883. This
45 shift of application support has been indicated on www.linux1394.org
46 and developers' mailinglists for quite some time. Major applications
47 have been converted, with the exception of ffmpeg and hence xine.
48 Piped output of dvgrab2 is a partial equivalent to dv1394.
49Who: Dan Dennedy <dan@dennedy.org>, Stefan Richter <stefanr@s5r6.in-berlin.de>
50
51---------------------------
52
42What: Video4Linux API 1 ioctls and video_decoder.h from Video devices. 53What: Video4Linux API 1 ioctls and video_decoder.h from Video devices.
43When: December 2006 54When: December 2006
44Why: V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6 55Why: V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6
diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index 672b92ef9f21..680da9e195dc 100644
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -161,17 +161,12 @@ config IEEE1394_ETH1394
161 MCAP, therefore multicast support is significantly limited. 161 MCAP, therefore multicast support is significantly limited.
162 162
163config IEEE1394_DV1394 163config IEEE1394_DV1394
164 tristate "OHCI-DV I/O support" 164 tristate "OHCI-DV I/O support (deprecated)"
165 depends on IEEE1394 && IEEE1394_OHCI1394 165 depends on IEEE1394 && IEEE1394_OHCI1394
166 help 166 help
167 This driver allows you to transmit and receive DV (digital video) 167 The dv1394 driver will be removed from Linux in a future release.
168 streams on an OHCI-1394 card using a simple frame-oriented 168 Its functionality is now provided by raw1394 together with libraries
169 interface. 169 such as libiec61883.
170
171 The user-space API for dv1394 is documented in dv1394.h.
172
173 To compile this driver as a module, say M here: the
174 module will be called dv1394.
175 170
176config IEEE1394_RAWIO 171config IEEE1394_RAWIO
177 tristate "Raw IEEE1394 I/O support" 172 tristate "Raw IEEE1394 I/O support"
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index d0e11c176c3b..3bd78efd1852 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -2579,6 +2579,10 @@ static int __init dv1394_init_module(void)
2579{ 2579{
2580 int ret; 2580 int ret;
2581 2581
2582 printk(KERN_WARNING
2583 "WARNING: The dv1394 driver is unsupported and will be removed "
2584 "from Linux soon. Use raw1394 instead.\n");
2585
2582 cdev_init(&dv1394_cdev, &dv1394_fops); 2586 cdev_init(&dv1394_cdev, &dv1394_fops);
2583 dv1394_cdev.owner = THIS_MODULE; 2587 dv1394_cdev.owner = THIS_MODULE;
2584 kobject_set_name(&dv1394_cdev.kobj, "dv1394"); 2588 kobject_set_name(&dv1394_cdev.kobj, "dv1394");