Merge branch 'fix/misc' into for-linus

[linux-2.6-microblaze.git] / include / linux / firewire.h

diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index 9823946..7e1d4de 100644 (file)
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -127,26 +127,13 @@ struct fw_card {
        struct delayed_work work;
        int bm_retries;
        int bm_generation;
+       __be32 bm_transaction_data[2];
 
        bool broadcast_channel_allocated;
        u32 broadcast_channel;
        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;