Commit b7d41a9fbb364c67d91c3588e117eba547e2d4bf
Exists in
master
and in
4 other branches
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.
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
Showing 53 changed files Side-by-side Diff
- Documentation/ABI/obsolete/dv1394
- Documentation/ABI/removed/dv1394
- Documentation/ABI/removed/raw1394
- Documentation/ABI/removed/raw1394_legacy_isochronous
- Documentation/ABI/removed/video1394
- Documentation/feature-removal-schedule.txt
- drivers/Makefile
- drivers/firewire/Kconfig
- drivers/firewire/Makefile
- drivers/firewire/init_ohci1394_dma.c
- drivers/ieee1394/Kconfig
- drivers/ieee1394/Makefile
- drivers/ieee1394/config_roms.c
- drivers/ieee1394/config_roms.h
- drivers/ieee1394/csr.c
- drivers/ieee1394/csr.h
- drivers/ieee1394/csr1212.c
- drivers/ieee1394/csr1212.h
- drivers/ieee1394/dma.c
- drivers/ieee1394/dma.h
- drivers/ieee1394/dv1394-private.h
- drivers/ieee1394/dv1394.c
- drivers/ieee1394/dv1394.h
- drivers/ieee1394/eth1394.c
- drivers/ieee1394/eth1394.h
- drivers/ieee1394/highlevel.c
- drivers/ieee1394/highlevel.h
- drivers/ieee1394/hosts.c
- drivers/ieee1394/hosts.h
- drivers/ieee1394/ieee1394-ioctl.h
- drivers/ieee1394/ieee1394.h
- drivers/ieee1394/ieee1394_core.c
- drivers/ieee1394/ieee1394_core.h
- drivers/ieee1394/ieee1394_hotplug.h
- drivers/ieee1394/ieee1394_transactions.c
- drivers/ieee1394/ieee1394_transactions.h
- drivers/ieee1394/ieee1394_types.h
- drivers/ieee1394/init_ohci1394_dma.c
- drivers/ieee1394/iso.c
- drivers/ieee1394/iso.h
- drivers/ieee1394/nodemgr.c
- drivers/ieee1394/nodemgr.h
- drivers/ieee1394/ohci1394.c
- drivers/ieee1394/ohci1394.h
- drivers/ieee1394/pcilynx.c
- drivers/ieee1394/pcilynx.h
- drivers/ieee1394/raw1394-private.h
- drivers/ieee1394/raw1394.c
- drivers/ieee1394/raw1394.h
- drivers/ieee1394/sbp2.c
- drivers/ieee1394/sbp2.h
- drivers/ieee1394/video1394.c
- drivers/ieee1394/video1394.h