Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: change deprecation status of dv1394
This commit is contained in:
commit
c3474be4dd
4 changed files with 14 additions and 16 deletions
9
Documentation/ABI/obsolete/dv1394
Normal file
9
Documentation/ABI/obsolete/dv1394
Normal file
|
@ -0,0 +1,9 @@
|
|||
What: dv1394 (a.k.a. "OHCI-DV I/O support" for FireWire)
|
||||
Contact: linux1394-devel@lists.sourceforge.net
|
||||
Description:
|
||||
New application development should use raw1394 + userspace libraries
|
||||
instead, notably libiec61883 which is functionally equivalent.
|
||||
|
||||
Users:
|
||||
ffmpeg/libavformat (used by a variety of media players)
|
||||
dvgrab v1.x (replaced by dvgrab2 on top of raw1394 and resp. libraries)
|
|
@ -39,17 +39,6 @@ Who: Dan Dennedy <dan@dennedy.org>, Stefan Richter <stefanr@s5r6.in-berlin.de>
|
|||
|
||||
---------------------------
|
||||
|
||||
What: dv1394 driver (CONFIG_IEEE1394_DV1394)
|
||||
When: June 2007
|
||||
Why: Replaced by raw1394 + userspace libraries, notably libiec61883. This
|
||||
shift of application support has been indicated on www.linux1394.org
|
||||
and developers' mailinglists for quite some time. Major applications
|
||||
have been converted, with the exception of ffmpeg and hence xine.
|
||||
Piped output of dvgrab2 is a partial equivalent to dv1394.
|
||||
Who: Dan Dennedy <dan@dennedy.org>, Stefan Richter <stefanr@s5r6.in-berlin.de>
|
||||
|
||||
---------------------------
|
||||
|
||||
What: Video4Linux API 1 ioctls and video_decoder.h from Video devices.
|
||||
When: December 2006
|
||||
Why: V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6
|
||||
|
|
|
@ -138,9 +138,9 @@ config IEEE1394_DV1394
|
|||
tristate "OHCI-DV I/O support (deprecated)"
|
||||
depends on IEEE1394 && IEEE1394_OHCI1394
|
||||
help
|
||||
The dv1394 driver will be removed from Linux in a future release.
|
||||
Its functionality is now provided by raw1394 together with libraries
|
||||
such as libiec61883.
|
||||
The dv1394 driver is unsupported and may be removed from Linux in a
|
||||
future release. Its functionality is now provided by raw1394 together
|
||||
with libraries such as libiec61883.
|
||||
|
||||
config IEEE1394_RAWIO
|
||||
tristate "Raw IEEE1394 I/O support"
|
||||
|
|
|
@ -2564,8 +2564,8 @@ static int __init dv1394_init_module(void)
|
|||
int ret;
|
||||
|
||||
printk(KERN_WARNING
|
||||
"WARNING: The dv1394 driver is unsupported and will be removed "
|
||||
"from Linux soon. Use raw1394 instead.\n");
|
||||
"NOTE: The dv1394 driver is unsupported and may be removed in a "
|
||||
"future Linux release. Use raw1394 instead.\n");
|
||||
|
||||
cdev_init(&dv1394_cdev, &dv1394_fops);
|
||||
dv1394_cdev.owner = THIS_MODULE;
|
||||
|
|
Loading…
Reference in a new issue