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: (43 commits)
  firewire: cleanups
  firewire: fix synchronization of gap counts
  firewire: wait until PHY configuration packet was transmitted (fix bus reset loop)
  firewire: remove unused struct member
  firewire: use bitwise and to get reg in handle_registers
  firewire: replace more hex values with defined csr constants
  firewire: reread config ROM when device reset the bus
  firewire: replace static ROM cache by allocated cache
  firewire: fw-ohci: work around generation bug in TI controllers (fix AV/C and more)
  firewire: fw-ohci: extend logging of bus generations and node ID
  firewire: fw-ohci: conditionally log busReset interrupts
  firewire: fw-ohci: don't append to AT context when it's not active
  firewire: fw-ohci: log regAccessFail events
  firewire: fw-ohci: make sure HCControl register LPS bit is set
  firewire: fw-ohci: missing PPC PMac feature calls in failure path
  firewire: fw-ohci: untangle a mixed unsigned/signed expression
  firewire: debug interrupt events
  firewire: fw-ohci: catch self_id_count == 0
  firewire: fw-ohci: add self ID error check
  firewire: fw-ohci: refactor probe, remove, suspend, resume
  ...

diff --combined lib/Kconfig.debug
index aaba784332e0cd158a67fa402b8615859d64a249,78955eb6bd943646df857c23db032d3ecb222aa2..95de3102bc87c61afe3289b117ffc16099a8df16
--- 1/lib/Kconfig.debug
--- 2/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -211,7 -211,7 +211,7 @@@ config SLUB_DEBUG_O
  config SLUB_STATS
        default n
        bool "Enable SLUB performance statistics"
 -      depends on SLUB
 +      depends on SLUB && SLUB_DEBUG && SYSFS
        help
          SLUB statistics are useful to debug SLUBs allocation behavior in
          order find ways to optimize the allocator. This should never be
@@@ -265,6 -265,16 +265,6 @@@ config DEBUG_MUTEXE
         This feature allows mutex semantics violations to be detected and
         reported.
  
 -config DEBUG_SEMAPHORE
 -      bool "Semaphore debugging"
 -      depends on DEBUG_KERNEL
 -      depends on ALPHA || FRV
 -      default n
 -      help
 -        If you say Y here then semaphore processing will issue lots of
 -        verbose debugging messages.  If you suspect a semaphore problem or a
 -        kernel hacker asks for this option then say Y.  Otherwise say N.
 -
  config DEBUG_LOCK_ALLOC
        bool "Lock debugging: detect incorrect freeing of live locks"
        depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
@@@ -583,7 -593,7 +583,7 @@@ config LATENCYTO
          to find out which userspace is blocking on what kernel operations.
  
  config PROVIDE_OHCI1394_DMA_INIT
-       bool "Provide code for enabling DMA over FireWire early on boot"
+       bool "Remote debugging over FireWire early on boot"
        depends on PCI && X86
        help
          If you want to debug problems which hang or crash the kernel early
@@@ -611,6 -621,15 +611,17 @@@
  
          See Documentation/debugging-via-ohci1394.txt for more information.
  
+ config FIREWIRE_OHCI_REMOTE_DMA
+       bool "Remote debugging over FireWire with firewire-ohci"
+       depends on FIREWIRE_OHCI
+       help
+         This option lets you use the FireWire bus for remote debugging
+         with help of the firewire-ohci driver. It enables unfiltered
+         remote DMA in firewire-ohci.
+         See Documentation/debugging-via-ohci1394.txt for more information.
+ 
+         If unsure, say N.
+ 
  source "samples/Kconfig"
 +
 +source "lib/Kconfig.kgdb"