Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: core: use more outbound tlabels
  firewire: core: don't update Broadcast_Channel if RFC 2734 conditions aren't met
  firewire: core: prepare for non-core children of card devices
  firewire: core: include linux/uaccess.h instead of asm/uaccess.h
  firewire: add parent-of-unit accessor
  firewire: rename source files
  firewire: reorganize header files
  firewire: clean up includes
  firewire: ohci: access bus_seconds atomically
  firewire: also use vendor ID in root directory for driver matches
  firewire: share device ID table type with ieee1394
  firewire: core: add sysfs attribute for easier udev rules
  firewire: core: check for missing struct update at build time, not run time
  firewire: core: improve check for local node

diff --cc drivers/firewire/sbp2.c
index a70e66e,2353643..24c4563
--- 1/drivers/firewire/fw-sbp2.c
--- 2/drivers/firewire/sbp2.c
+++ b/drivers/firewire/sbp2.c
@@@ -1240,10 -1251,10 +1251,10 @@@ static void sbp2_reconnect(struct work_
  
  static void sbp2_update(struct fw_unit *unit)
  {
 -      struct sbp2_target *tgt = unit->device.driver_data;
 +      struct sbp2_target *tgt = dev_get_drvdata(&unit->device);
        struct sbp2_logical_unit *lu;
  
-       fw_device_enable_phys_dma(fw_device(unit->device.parent));
+       fw_device_enable_phys_dma(fw_parent_device(unit));
  
        /*
         * Fw-core serializes sbp2_update() against sbp2_remove().