Merge branch 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  ieee1394: remove the old IEEE 1394 driver stack
  ieee1394: move init_ohci1394_dma to drivers/firewire/

Fix trivial change/delete conflict: drivers/ieee1394/eth1394.c is
getting removed, but was modified by the networking merge.

5 files changed, 45 insertions, 25 deletions

diff --git a/Documentation/ABI/obsolete/dv1394 b/Documentation/ABI/obsolete/dv1394
deleted file mode 100644
index 2ee36864ca10..000000000000
--- a/Documentation/ABI/obsolete/dv1394
+++ /dev/null
@@ -1,9 +0,0 @@
-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)
diff --git a/Documentation/ABI/removed/dv1394 b/Documentation/ABI/removed/dv1394
new file mode 100644
index 000000000000..c2310b6676f4
--- /dev/null
+++ b/Documentation/ABI/removed/dv1394
@@ -0,0 +1,14 @@
+What:           dv1394 (a.k.a. "OHCI-DV I/O support" for FireWire)
+Date:           May 2010 (scheduled), finally removed in kernel v2.6.37
+Contact:        linux1394-devel@lists.sourceforge.net
+Description:
+        /dev/dv1394/* were character device files, one for each FireWire
+        controller and for NTSC and PAL respectively, from which DV data
+        could be received by read() or transmitted by write().  A few
+        ioctl()s allowed limited control.
+        This special-purpose interface has been superseded by libraw1394 +
+        libiec61883 which are functionally equivalent, support HDV, and
+        transparently work on top of the newer firewire kernel drivers.
+
+Users:
+        ffmpeg/libavformat (if configured for DV1394)
diff --git a/Documentation/ABI/removed/raw1394 b/Documentation/ABI/removed/raw1394
new file mode 100644
index 000000000000..490aa1efc4ae
--- /dev/null
+++ b/Documentation/ABI/removed/raw1394
@@ -0,0 +1,15 @@
+What:           raw1394 (a.k.a. "Raw IEEE1394 I/O support" for FireWire)
+Date:           May 2010 (scheduled), finally removed in kernel v2.6.37
+Contact:        linux1394-devel@lists.sourceforge.net
+Description:
+        /dev/raw1394 was a character device file that allowed low-level
+        access to FireWire buses.  Its major drawbacks were its inability
+        to implement sensible device security policies, and its low level
+        of abstraction that required userspace clients do duplicate much
+        of the kernel's ieee1394 core functionality.
+        Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
+        firewire-core.
+
+Users:
+        libraw1394 (works with firewire-cdev too, transparent to library ABI
+        users)
diff --git a/Documentation/ABI/removed/raw1394_legacy_isochronous b/Documentation/ABI/removed/raw1394_legacy_isochronous
deleted file mode 100644
index 1b629622d883..000000000000
--- a/Documentation/ABI/removed/raw1394_legacy_isochronous
+++ /dev/null
@@ -1,16 +0,0 @@
-What:           legacy isochronous ABI of raw1394 (1st generation iso ABI)
-Date:           June 2007 (scheduled), removed in kernel v2.6.23
-Contact:        linux1394-devel@lists.sourceforge.net
-Description:
-        The two request types RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN have
-        been deprecated for quite some time.  They are very inefficient as they
-        come with high interrupt load and several layers of callbacks for each
-        packet.  Because of these deficiencies, the video1394 and dv1394 drivers
-        and the 3rd-generation isochronous ABI in raw1394 (rawiso) were created.
-
-Users:
-        libraw1394 users via the long deprecated API raw1394_iso_write,
-        raw1394_start_iso_write, raw1394_start_iso_rcv, raw1394_stop_iso_rcv
-
-        libdc1394, which optionally uses these old libraw1394 calls
-        alternatively to the more efficient video1394 ABI
diff --git a/Documentation/ABI/removed/video1394 b/Documentation/ABI/removed/video1394
new file mode 100644
index 000000000000..c39c25aee77b
--- /dev/null
+++ b/Documentation/ABI/removed/video1394
@@ -0,0 +1,16 @@
+What:           video1394 (a.k.a. "OHCI-1394 Video support" for FireWire)
+Date:           May 2010 (scheduled), finally removed in kernel v2.6.37
+Contact:        linux1394-devel@lists.sourceforge.net
+Description:
+        /dev/video1394/* were character device files, one for each FireWire
+        controller, which were used for isochronous I/O.  It was added as an
+        alternative to raw1394's isochronous I/O functionality which had
+        performance issues in its first generation.  Any video1394 user had
+        to use raw1394 + libraw1394 too because video1394 did not provide
+        asynchronous I/O for device discovery and configuration.
+        Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
+        firewire-core.
+
+Users:
+        libdc1394 (works with firewire-cdev too, transparent to library ABI
+        users)