diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
| commit | 708b8eae0fd532af73ea8350e6dcc10255ff7376 (patch) | |
| tree | f336436934fd79bc91aff7112a9beb10bc4e839f /drivers/firewire/fw-transaction.h | |
| parent | d98d38f2014ab79f28c126ff175d034891f7aefc (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
Merge branch 'linus' into core/locking
Diffstat (limited to 'drivers/firewire/fw-transaction.h')
| -rw-r--r-- | drivers/firewire/fw-transaction.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h index 027f58ce81ad..aed7dbb17cda 100644 --- a/drivers/firewire/fw-transaction.h +++ b/drivers/firewire/fw-transaction.h | |||
| @@ -248,7 +248,7 @@ struct fw_card { | |||
| 248 | struct fw_node *local_node; | 248 | struct fw_node *local_node; |
| 249 | struct fw_node *root_node; | 249 | struct fw_node *root_node; |
| 250 | struct fw_node *irm_node; | 250 | struct fw_node *irm_node; |
| 251 | int color; | 251 | u8 color; /* must be u8 to match the definition in struct fw_node */ |
| 252 | int gap_count; | 252 | int gap_count; |
| 253 | bool beta_repeaters_present; | 253 | bool beta_repeaters_present; |
| 254 | 254 | ||