diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-06 14:03:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-06 14:03:44 -0700 |
| commit | f63bafe55654caf3a62f73500eafd1b89ca6f7ff (patch) | |
| tree | d8c80b71e1197fb805c07282139377e9542421ea /include | |
| parent | fb: Initialize fb_info mutexes in framebuffer_alloc() (diff) | |
| parent | ieee1394: sbp2: add support for disks >2 TB (and 16 bytes long CDBs) (diff) | |
| download | linux-dev-f63bafe55654caf3a62f73500eafd1b89ca6f7ff.tar.xz linux-dev-f63bafe55654caf3a62f73500eafd1b89ca6f7ff.zip | |
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:
ieee1394: sbp2: add support for disks >2 TB (and 16 bytes long CDBs)
firewire: sbp2: add support for disks >2 TB (and 16 bytes long CDBs)
firewire: core: do not DMA-map stack addresses
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/firewire.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/firewire.h b/include/linux/firewire.h index 9823946adbc5..192d1e43c43c 100644 --- a/include/linux/firewire.h +++ b/include/linux/firewire.h @@ -127,6 +127,7 @@ struct fw_card { struct delayed_work work; int bm_retries; int bm_generation; + __be32 bm_transaction_data[2]; bool broadcast_channel_allocated; u32 broadcast_channel; |