Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux

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

diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h
index 5f131f5129dae5d0cfee7a293bcea04b99430782..df51732608d96270a86611c541aaec8cdb7a2150 100644 (file)
--- a/drivers/firewire/fw-device.h
+++ b/drivers/firewire/fw-device.h
@@ -21,6 +21,7 @@
 
 #include <linux/fs.h>
 #include <linux/cdev.h>
+#include <linux/idr.h>
 #include <linux/rwsem.h>
 #include <asm/atomic.h>
 
@@ -62,7 +63,6 @@ struct fw_device {
        bool cmc;
        struct fw_card *card;
        struct device device;
-       struct list_head link;
        struct list_head client_list;
        u32 *config_rom;
        size_t config_rom_length;
@@ -100,6 +100,7 @@ void fw_device_cdev_update(struct fw_device *device);
 void fw_device_cdev_remove(struct fw_device *device);
 
 extern struct rw_semaphore fw_device_rwsem;
+extern struct idr fw_device_idr;
 extern int fw_cdev_major;
 
 /*