Merge branch 'juju' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux13...

* 'juju' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (138 commits)
  firewire: Convert OHCI driver to use standard goto unwinding for error handling.
  firewire: Always use parens with sizeof.
  firewire: Drop single buffer request support.
  firewire: Add a comment to describe why we split the sg list.
  firewire: Return SCSI_MLQUEUE_HOST_BUSY for out of memory cases in queuecommand.
  firewire: Handle the last few DMA mapping error cases.
  firewire: Allocate scsi_host up front and allocate the sbp2_device as hostdata.
  firewire: Provide module aliase for backwards compatibility.
  firewire: Add to fw-core-y instead of assigning fw-core-objs in Makefile.
  firewire: Break out shared IEEE1394 constant to separate header file.
  firewire: Use linux/*.h instead of asm/*.h header files.
  firewire: Uppercase most macro names.
  firewire: Coding style cleanup: no spaces after function names.
  firewire: Convert card_rwsem to a regular mutex.
  firewire: Clean up comment style.
  firewire: Use lib/ implementation of CRC ITU-T.
  CRC ITU-T V.41
  firewire: Rename fw-device-cdev.c to fw-cdev.c and move header to include/linux.
  firewire: Future proof the iso ioctls by adding a handle for the iso context.
  firewire: Add read/write and size annotations to IOC numbers.
  ...

Acked-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --combined drivers/Makefile
index 26ca9031ea496320106d62772dba56e178eae7c7,ace16e9754ad3e29de5ae867265048e953fa2e5f..adad2f3d438a07929ca9842ac96fb8b3d4dac329
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -36,6 -36,7 +36,7 @@@ obj-$(CONFIG_FC4)             += fc4
  obj-$(CONFIG_SCSI)            += scsi/
  obj-$(CONFIG_ATA)             += ata/
  obj-$(CONFIG_FUSION)          += message/
+ obj-$(CONFIG_FIREWIRE)                += firewire/
  obj-$(CONFIG_IEEE1394)                += ieee1394/
  obj-y                         += cdrom/
  obj-y                         += auxdisplay/
@@@ -58,7 -59,7 +59,7 @@@ obj-$(CONFIG_GAMEPORT)                += input/gamepo
  obj-$(CONFIG_INPUT)           += input/
  obj-$(CONFIG_I2O)             += message/
  obj-$(CONFIG_RTC_LIB)         += rtc/
 -obj-$(CONFIG_I2C)             += i2c/
 +obj-y                         += i2c/
  obj-$(CONFIG_W1)              += w1/
  obj-$(CONFIG_HWMON)           += hwmon/
  obj-$(CONFIG_PHONE)           += telephony/
@@@ -72,6 -73,7 +73,6 @@@ obj-$(CONFIG_CPU_FREQ)                += cpufreq
  obj-$(CONFIG_MMC)             += mmc/
  obj-$(CONFIG_NEW_LEDS)                += leds/
  obj-$(CONFIG_INFINIBAND)      += infiniband/
 -obj-$(CONFIG_IPATH_CORE)      += infiniband/
  obj-$(CONFIG_SGI_SN)          += sn/
  obj-y                         += firmware/
  obj-$(CONFIG_CRYPTO)          += crypto/

diff --combined drivers/ieee1394/Kconfig
index f21426ad2faaf1d963af5afd7a95bcb2e63d56fc,c668538201bbfa4980d2f35a7133b439e4283904..8012b3b0ce75b83c23ae81f872fadb645167e3f1
--- 1/drivers/ieee1394/Kconfig
--- 2/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@@ -1,9 -1,13 +1,11 @@@
 -# -*- shell-script -*-
 -
  menu "IEEE 1394 (FireWire) support"
 +      depends on PCI || BROKEN
  
+ source "drivers/firewire/Kconfig"
+ 
  config IEEE1394
        tristate "IEEE 1394 (FireWire) support"
        depends on PCI || BROKEN
 -      select NET
        help
          IEEE 1394 describes a high performance serial bus, which is also
          known as FireWire(tm) or i.Link(tm) and is used for connecting all
@@@ -33,7 -37,24 +35,7 @@@ config IEEE1394_VERBOSEDEBU
          Say Y if you really want or need the debugging output, everyone
          else says N.
  
 -config IEEE1394_EXTRA_CONFIG_ROMS
 -      bool "Build in extra config rom entries for certain functionality"
 -      depends on IEEE1394
 -      help
 -        Some IEEE1394 functionality depends on extra config rom entries
 -        being available in the host adapters CSR. These options will
 -        allow you to choose which ones.
 -
 -config IEEE1394_CONFIG_ROM_IP1394
 -      bool "IP-1394 Entry"
 -      depends on IEEE1394_EXTRA_CONFIG_ROMS && IEEE1394
 -      help
 -        Adds an entry for using IP-over-1394. If you want to use your
 -        IEEE1394 bus as a network for IP systems (including interacting
 -        with MacOSX and WinXP IP-over-1394), enable this option and the
 -        eth1394 option below.
 -
 -comment "Device Drivers"
 +comment "Controllers"
        depends on IEEE1394
  
  comment "Texas Instruments PCILynx requires I2C"
@@@ -51,10 -72,6 +53,10 @@@ config IEEE1394_PCILYN
          To compile this driver as a module, say M here: the
          module will be called pcilynx.
  
 +        Only some old and now very rare PCI and CardBus cards and
 +        PowerMacs G3 B&W contain the PCILynx controller.  Therefore
 +        almost everybody can say N here.
 +
  config IEEE1394_OHCI1394
        tristate "OHCI-1394 support"
        depends on PCI && IEEE1394
@@@ -68,7 -85,7 +70,7 @@@
          To compile this driver as a module, say M here: the
          module will be called ohci1394.
  
 -comment "Protocol Drivers"
 +comment "Protocols"
        depends on IEEE1394
  
  config IEEE1394_VIDEO1394
@@@ -106,15 -123,11 +108,15 @@@ config IEEE1394_SBP2_PHYS_DM
          This option is buggy and currently broken on some architectures.
          If unsure, say N.
  
 +config IEEE1394_ETH1394_ROM_ENTRY
 +      depends on IEEE1394
 +      bool
 +      default n
 +
  config IEEE1394_ETH1394
 -      tristate "Ethernet over 1394"
 +      tristate "IP over 1394"
        depends on IEEE1394 && EXPERIMENTAL && INET
 -      select IEEE1394_CONFIG_ROM_IP1394
 -      select IEEE1394_EXTRA_CONFIG_ROMS
 +      select IEEE1394_ETH1394_ROM_ENTRY
        help
          This driver implements a functional majority of RFC 2734: IPv4 over
          1394.  It will provide IP connectivity with implementations of RFC
@@@ -123,26 -136,24 +125,26 @@@
          This driver is still considered experimental.  It does not yet support
          MCAP, therefore multicast support is significantly limited.
  
 +        The module is called eth1394 although it does not emulate Ethernet.
 +
  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"
        depends on IEEE1394
        help
 -        Say Y here if you want support for the raw device. This is generally
 -        a good idea, so you should say Y here. The raw device enables
 -        direct communication of user programs with the IEEE 1394 bus and
 -        thus with the attached peripherals.
 +        This option adds support for the raw1394 device file which enables
 +        direct communication of user programs with the IEEE 1394 bus and thus
 +        with the attached peripherals.  Almost all application programs which
 +        access FireWire require this option.
  
 -        To compile this driver as a module, say M here: the
 -        module will be called raw1394.
 +        To compile this driver as a module, say M here: the module will be
 +        called raw1394.
  
  endmenu

diff --combined lib/Kconfig
index 96d6e8ca8b70c4c90ea4a96f182dd1af16a72043,91477b9dc924b53aef042e23522252dcfccbeada..2e7ae6b9215b2d390d30171c4e61e000f7079705
--- 1/lib/Kconfig
--- 2/lib/Kconfig
+++ b/lib/Kconfig
@@@ -23,6 -23,14 +23,14 @@@ config CRC1
          the kernel tree does. Such modules that use library CRC16
          functions require M here.
  
+ config CRC_ITU_T
+       tristate "CRC ITU-T V.41 functions"
+       help
+         This option is provided for the case where no in-kernel-tree
+         modules require CRC ITU-T V.41 functions, but a module built outside
+         the kernel tree does. Such modules that use library CRC ITU-T V.41
+         functions require M here.
+ 
  config CRC32
        tristate "CRC32 functions"
        default y
@@@ -111,9 -119,4 +119,9 @@@ config HAS_IOPOR
        depends on HAS_IOMEM && !NO_IOPORT
        default y
  
 +config HAS_DMA
 +      boolean
 +      depends on !NO_DMA
 +      default y
 +
  endmenu

diff --combined lib/Makefile
index ae57f357fec07e0cf9d65fb3824d0bd193c37739,2a9e47cc7f22028acd38ed8052ed90c3bbcf0f21..1f65b4613e09fa6d57b963d6764ffd6e009fbda7
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -4,7 -4,7 +4,7 @@@
  
  lib-y := ctype.o string.o vsprintf.o cmdline.o \
         rbtree.o radix-tree.o dump_stack.o \
 -       idr.o div64.o int_sqrt.o bitmap.o extable.o prio_tree.o \
 +       idr.o int_sqrt.o bitmap.o extable.o prio_tree.o \
         sha1.o irq_regs.o reciprocal_div.o
  
  lib-$(CONFIG_MMU) += ioremap.o
@@@ -12,8 -12,7 +12,8 @@@ lib-$(CONFIG_SMP) += cpumask.
  
  lib-y += kobject.o kref.o kobject_uevent.o klist.o
  
 -obj-y += sort.o parser.o halfmd4.o debug_locks.o random32.o bust_spinlocks.o
 +obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
 +       bust_spinlocks.o
  
  ifeq ($(CONFIG_DEBUG_KOBJECT),y)
  CFLAGS_kobject.o += -DDEBUG
@@@ -41,6 -40,7 +41,7 @@@ endi
  obj-$(CONFIG_BITREVERSE) += bitrev.o
  obj-$(CONFIG_CRC_CCITT)       += crc-ccitt.o
  obj-$(CONFIG_CRC16)   += crc16.o
+ obj-$(CONFIG_CRC_ITU_T)       += crc-itu-t.o
  obj-$(CONFIG_CRC32)   += crc32.o
  obj-$(CONFIG_LIBCRC32C)       += libcrc32c.o
  obj-$(CONFIG_GENERIC_ALLOCATOR) += genalloc.o