Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
index 1a22a23e4596fd41a57e4844cad60e3d16dfdb2a..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);
@@ -224,8 +220,6 @@ struct fw_card {
 
        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;