From cb8489dcc1e5250af2e4d830ae0451c2be3689f2 Mon Sep 17 00:00:00 2001
From: Chris Boot <bootc@bootc.net>
Date: Wed, 1 Feb 2012 22:36:02 +0000
Subject: [PATCH] --- yaml --- r: 305909 b: refs/heads/master c:
 fc5f80b152896c1ffded2a91d11dcb08ffcffebb h: refs/heads/master i:   305907:
 260a8561b1eabf799203edc9c3d1fe5173a63dda v: v3

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

diff --git a/[refs] b/[refs]
index 67e4c3d0ccc9..d1f682901757 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 253d92371ca29a470b2bbf91fb9824a9fef05657
+refs/heads/master: fc5f80b152896c1ffded2a91d11dcb08ffcffebb
diff --git a/trunk/drivers/firewire/core-card.c b/trunk/drivers/firewire/core-card.c
index cc595eba7ba9..f5552b362efc 100644
--- a/trunk/drivers/firewire/core-card.c
+++ b/trunk/drivers/firewire/core-card.c
@@ -676,6 +676,7 @@ void fw_card_release(struct kref *kref)
 
 	complete(&card->done);
 }
+EXPORT_SYMBOL_GPL(fw_card_release);
 
 void fw_core_remove_card(struct fw_card *card)
 {
diff --git a/trunk/drivers/firewire/core.h b/trunk/drivers/firewire/core.h
index 9047f5547d98..b5a2f6197053 100644
--- a/trunk/drivers/firewire/core.h
+++ b/trunk/drivers/firewire/core.h
@@ -120,21 +120,6 @@ int fw_compute_block_crc(__be32 *block);
 void fw_schedule_bus_reset(struct fw_card *card, bool delayed, bool short_reset);
 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 */
 
 extern const struct file_operations fw_device_ops;
diff --git a/trunk/include/linux/firewire.h b/trunk/include/linux/firewire.h
index 46831303b0b9..e83c24af358a 100644
--- a/trunk/include/linux/firewire.h
+++ b/trunk/include/linux/firewire.h
@@ -135,6 +135,20 @@ struct fw_card {
 	__be32 maint_utility_register;
 };
 
+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;