From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Apr 2008 18:24:29 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Tag: v2.6.26-rc1~1141
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=eddeb0e2d863e3941d8768e70cb50c6120e61fa0;p=linux-2.6-omap-h63xx.git

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

* '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
  ...
---

eddeb0e2d863e3941d8768e70cb50c6120e61fa0
diff --cc lib/Kconfig.debug
index aaba784332e,78955eb6bd9..95de3102bc8
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -611,6 -621,15 +611,17 @@@ config PROVIDE_OHCI1394_DMA_INI
  
  	  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"