aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/firewire/fw-ohci.c2
-rw-r--r--drivers/firewire/fw-transaction.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index d5d8177da6d9..4f02c55f13e1 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -178,7 +178,7 @@ struct fw_ohci {
178 struct tasklet_struct bus_reset_tasklet; 178 struct tasklet_struct bus_reset_tasklet;
179 int node_id; 179 int node_id;
180 int generation; 180 int generation;
181 int request_generation; 181 int request_generation; /* for timestamping incoming requests */
182 u32 bus_seconds; 182 u32 bus_seconds;
183 bool old_uninorth; 183 bool old_uninorth;
184 bool bus_reset_packet_quirk; 184 bool bus_reset_packet_quirk;
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
index 1a22a23e4596..8d1987f9c61e 100644
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -224,8 +224,6 @@ struct fw_card {
224 224
225 int node_id; 225 int node_id;
226 int generation; 226 int generation;
227 /* This is the generation used for timestamping incoming requests. */
228 int request_generation;
229 int current_tlabel, tlabel_mask; 227 int current_tlabel, tlabel_mask;
230 struct list_head transaction_list; 228 struct list_head transaction_list;
231 struct timer_list flush_timer; 229 struct timer_list flush_timer;