From 3a4fc097353a4c53814ae832de7f429e8f756cd0 Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sun, 6 Sep 2009 18:49:48 +0200
Subject: [PATCH] --- yaml --- r: 165315 b: refs/heads/master c:
 18668ff9a3232d5f942a2f7abc1ad67d2760dcdf h: refs/heads/master i:   165313:
 951bfdd1d21d49a64ff0f0e1ff7f14d00eb14339   165311:
 008cc6de490fbd1a0366acc9e9b5c54049fe849e v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/firewire/core.h  | 14 ++++++++++++++
 trunk/include/linux/firewire.h | 14 --------------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index a86c84636ba0..6b32f5c84e0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 928ec5f148e729076e9202e7c78babede628a50c
+refs/heads/master: 18668ff9a3232d5f942a2f7abc1ad67d2760dcdf
diff --git a/trunk/drivers/firewire/core.h b/trunk/drivers/firewire/core.h
index 6052816be353..7ff6e7585152 100644
--- a/trunk/drivers/firewire/core.h
+++ b/trunk/drivers/firewire/core.h
@@ -96,6 +96,20 @@ int fw_core_initiate_bus_reset(struct fw_card *card, int short_reset);
 int fw_compute_block_crc(u32 *block);
 void fw_schedule_bm_work(struct fw_card *card, unsigned long delay);
 
+static inline struct fw_card *fw_card_get(struct fw_card *card)
+{
+	kref_get(&card->kref);
+
+	return card;
+}
+
+void fw_card_release(struct kref *kref);
+
+static inline void fw_card_put(struct fw_card *card)
+{
+	kref_put(&card->kref, fw_card_release);
+}
+
 
 /* -cdev */
 
diff --git a/trunk/include/linux/firewire.h b/trunk/include/linux/firewire.h
index 192d1e43c43c..7e1d4dec83e7 100644
--- a/trunk/include/linux/firewire.h
+++ b/trunk/include/linux/firewire.h
@@ -134,20 +134,6 @@ struct fw_card {
 	u32 topology_map[(CSR_TOPOLOGY_MAP_END - CSR_TOPOLOGY_MAP) / 4];
 };
 
-static inline struct fw_card *fw_card_get(struct fw_card *card)
-{
-	kref_get(&card->kref);
-
-	return card;
-}
-
-void fw_card_release(struct kref *kref);
-
-static inline void fw_card_put(struct fw_card *card)
-{
-	kref_put(&card->kref, fw_card_release);
-}
-
 struct fw_attribute_group {
 	struct attribute_group *groups[2];
 	struct attribute_group group;