Merge branch 'merge-fixes' into devel

[linux-2.6-omap-h63xx.git] / drivers / firewire / fw-transaction.h

diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
index a43bb22912f9da9488fd83a2060b80c78bdfe55b..04d3854f65600924e53183b63f4001d048d047eb 100644 (file)
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -201,11 +201,7 @@ struct fw_address_region {
        u64 end;
 };
 
-extern const struct fw_address_region fw_low_memory_region;
 extern const struct fw_address_region fw_high_memory_region;
-extern const struct fw_address_region fw_private_region;
-extern const struct fw_address_region fw_csr_region;
-extern const struct fw_address_region fw_unit_space_region;
 
 int fw_core_add_address_handler(struct fw_address_handler *handler,
                                const struct fw_address_region *region);
@@ -221,12 +217,9 @@ struct fw_card {
        const struct fw_card_driver *driver;
        struct device *device;
        atomic_t device_count;
-       struct kref kref;
 
        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;
@@ -263,9 +256,6 @@ struct fw_card {
        int bm_generation;
 };
 
-struct fw_card *fw_card_get(struct fw_card *card);
-void fw_card_put(struct fw_card *card);
-
 /*
  * The iso packet format allows for an immediate header/payload part
  * stored in 'header' immediately after the packet info plus an