From dca1e3348d154c0863056b1d747f0cd912f2fe9f Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Tue, 11 Mar 2008 02:23:29 +0100 Subject: [PATCH] --- yaml --- r: 89644 b: refs/heads/master c: e09770db0fa33baf8df21fbc18aa24a080330c3f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/firewire/fw-ohci.c | 2 +- trunk/drivers/firewire/fw-transaction.h | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 006b94aa50a7..b2913f122f98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15f0d833f63da2fa49aed81480a37d5e896b5b9b +refs/heads/master: e09770db0fa33baf8df21fbc18aa24a080330c3f diff --git a/trunk/drivers/firewire/fw-ohci.c b/trunk/drivers/firewire/fw-ohci.c index d5d8177da6d9..4f02c55f13e1 100644 --- a/trunk/drivers/firewire/fw-ohci.c +++ b/trunk/drivers/firewire/fw-ohci.c @@ -178,7 +178,7 @@ struct fw_ohci { struct tasklet_struct bus_reset_tasklet; int node_id; int generation; - int request_generation; + int request_generation; /* for timestamping incoming requests */ u32 bus_seconds; bool old_uninorth; bool bus_reset_packet_quirk; diff --git a/trunk/drivers/firewire/fw-transaction.h b/trunk/drivers/firewire/fw-transaction.h index 1a22a23e4596..8d1987f9c61e 100644 --- a/trunk/drivers/firewire/fw-transaction.h +++ b/trunk/drivers/firewire/fw-transaction.h @@ -224,8 +224,6 @@ struct fw_card { int node_id; int generation; - /* This is the generation used for timestamping incoming requests. */ - int request_generation; int current_tlabel, tlabel_mask; struct list_head transaction_list; struct timer_list flush_timer;