From ddce4a431b5eb2fcccb816120d4f60c295f1402f Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sun, 14 Dec 2008 21:47:36 +0100
Subject: [PATCH] --- yaml --- r: 135998 b: refs/heads/master c:
 da62df141e3f879445e3daef36bd3a12c90841e2 h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/firewire/fw-transaction.h | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 93eb4463311e..9c5d7cebcb8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53dca51175cc2f66d21aeb1e70146cca65c53dad
+refs/heads/master: da62df141e3f879445e3daef36bd3a12c90841e2
diff --git a/trunk/drivers/firewire/fw-transaction.h b/trunk/drivers/firewire/fw-transaction.h
index 7112e62942ff..0dd96ecc2dcd 100644
--- a/trunk/drivers/firewire/fw-transaction.h
+++ b/trunk/drivers/firewire/fw-transaction.h
@@ -138,12 +138,6 @@ typedef void (*fw_address_callback_t)(struct fw_card *card,
 				      void *data, size_t length,
 				      void *callback_data);
 
-typedef void (*fw_bus_reset_callback_t)(struct fw_card *handle,
-					int node_id, int generation,
-					u32 *self_ids,
-					int self_id_count,
-					void *callback_data);
-
 struct fw_packet {
 	int speed;
 	int generation;
@@ -184,12 +178,6 @@ struct fw_transaction {
 	void *callback_data;
 };
 
-static inline struct fw_packet *
-fw_packet(struct list_head *l)
-{
-	return list_entry(l, struct fw_packet, link);
-}
-
 struct fw_address_handler {
 	u64 offset;
 	size_t length;