diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-18 19:31:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-18 19:31:56 -0500 |
| commit | 23cb3ada1b011f708ff881b66b2cfb6c11068fa5 (patch) | |
| tree | c2413fe7180f480b4ecdfd91bdfc0f23ff7df8a5 /drivers/ieee1394/hosts.h | |
| parent | 27f4e0834746196f219e3e030ca71ffd3b176483 (diff) | |
| parent | 16e842a62a8ffcc2e51def6ef9fd6e0926539bc5 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394
Diffstat (limited to 'drivers/ieee1394/hosts.h')
| -rw-r--r-- | drivers/ieee1394/hosts.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ieee1394/hosts.h b/drivers/ieee1394/hosts.h index 38f42112dff0..ae9b02cc013f 100644 --- a/drivers/ieee1394/hosts.h +++ b/drivers/ieee1394/hosts.h | |||
| @@ -41,6 +41,7 @@ struct hpsb_host { | |||
| 41 | /* this nodes state */ | 41 | /* this nodes state */ |
| 42 | unsigned in_bus_reset:1; | 42 | unsigned in_bus_reset:1; |
| 43 | unsigned is_shutdown:1; | 43 | unsigned is_shutdown:1; |
| 44 | unsigned resume_packet_sent:1; | ||
| 44 | 45 | ||
| 45 | /* this nodes' duties on the bus */ | 46 | /* this nodes' duties on the bus */ |
| 46 | unsigned is_root:1; | 47 | unsigned is_root:1; |