diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-01 09:34:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-01 09:34:23 -0800 |
| commit | 6a1214113090905aca6a492fc8ef10d84c608a69 (patch) | |
| tree | 83e0b825725ff23b3c8f15761f0ec9472ecc082c /drivers/ieee1394/hosts.h | |
| parent | c07f62e5f18123103459ff74e86af1518a5b8af5 (diff) | |
| parent | 2642b11295ebcc94843045933061bfbb263fce7f (diff) | |
| download | kernel-crypto-6a1214113090905aca6a492fc8ef10d84c608a69.tar.gz kernel-crypto-6a1214113090905aca6a492fc8ef10d84c608a69.tar.xz kernel-crypto-6a1214113090905aca6a492fc8ef10d84c608a69.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: fix race condition in state change
ieee1394: fix list corruption (reported at module removal)
firewire: fw-sbp2: another iPod mini quirk entry
ieee1394: sbp2: another iPod mini quirk entry
Diffstat (limited to 'drivers/ieee1394/hosts.h')
| -rw-r--r-- | drivers/ieee1394/hosts.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ieee1394/hosts.h b/drivers/ieee1394/hosts.h index e4e8aeb4d77..dd229950acc 100644 --- a/drivers/ieee1394/hosts.h +++ b/drivers/ieee1394/hosts.h @@ -13,6 +13,7 @@ struct module; #include "ieee1394_types.h" #include "csr.h" +#include "highlevel.h" struct hpsb_packet; struct hpsb_iso; @@ -72,6 +73,9 @@ struct hpsb_host { struct { DECLARE_BITMAP(map, 64); } tl_pool[ALL_NODES]; struct csr_control csr; + + struct hpsb_address_serve dummy_zero_addr; + struct hpsb_address_serve dummy_max_addr; }; enum devctl_cmd { |