diff options
Diffstat (limited to 'drivers/firewire')
-rw-r--r-- | drivers/firewire/fw-device.c | 2 | ||||
-rw-r--r-- | drivers/firewire/fw-device.h | 2 | ||||
-rw-r--r-- | drivers/firewire/fw-transaction.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c index 6b9be42c7b98..31b6c74d34df 100644 --- a/drivers/firewire/fw-device.c +++ b/drivers/firewire/fw-device.c | |||
@@ -617,7 +617,7 @@ static int shutdown_unit(struct device *device, void *data) | |||
617 | */ | 617 | */ |
618 | DECLARE_RWSEM(fw_device_rwsem); | 618 | DECLARE_RWSEM(fw_device_rwsem); |
619 | 619 | ||
620 | static DEFINE_IDR(fw_device_idr); | 620 | DEFINE_IDR(fw_device_idr); |
621 | int fw_cdev_major; | 621 | int fw_cdev_major; |
622 | 622 | ||
623 | struct fw_device *fw_device_get_by_devt(dev_t devt) | 623 | struct fw_device *fw_device_get_by_devt(dev_t devt) |
diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h index 42305bbac72f..df51732608d9 100644 --- a/drivers/firewire/fw-device.h +++ b/drivers/firewire/fw-device.h | |||
@@ -21,6 +21,7 @@ | |||
21 | 21 | ||
22 | #include <linux/fs.h> | 22 | #include <linux/fs.h> |
23 | #include <linux/cdev.h> | 23 | #include <linux/cdev.h> |
24 | #include <linux/idr.h> | ||
24 | #include <linux/rwsem.h> | 25 | #include <linux/rwsem.h> |
25 | #include <asm/atomic.h> | 26 | #include <asm/atomic.h> |
26 | 27 | ||
@@ -99,6 +100,7 @@ void fw_device_cdev_update(struct fw_device *device); | |||
99 | void fw_device_cdev_remove(struct fw_device *device); | 100 | void fw_device_cdev_remove(struct fw_device *device); |
100 | 101 | ||
101 | extern struct rw_semaphore fw_device_rwsem; | 102 | extern struct rw_semaphore fw_device_rwsem; |
103 | extern struct idr fw_device_idr; | ||
102 | extern int fw_cdev_major; | 104 | extern int fw_cdev_major; |
103 | 105 | ||
104 | /* | 106 | /* |
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c index 2884f876397b..699ac041f39a 100644 --- a/drivers/firewire/fw-transaction.c +++ b/drivers/firewire/fw-transaction.c | |||
@@ -19,6 +19,7 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <linux/completion.h> | 21 | #include <linux/completion.h> |
22 | #include <linux/idr.h> | ||
22 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
23 | #include <linux/kref.h> | 24 | #include <linux/kref.h> |
24 | #include <linux/module.h> | 25 | #include <linux/module.h> |
@@ -971,6 +972,7 @@ static void __exit fw_core_cleanup(void) | |||
971 | { | 972 | { |
972 | unregister_chrdev(fw_cdev_major, "firewire"); | 973 | unregister_chrdev(fw_cdev_major, "firewire"); |
973 | bus_unregister(&fw_bus_type); | 974 | bus_unregister(&fw_bus_type); |
975 | idr_destroy(&fw_device_idr); | ||
974 | } | 976 | } |
975 | 977 | ||
976 | module_init(fw_core_init); | 978 | module_init(fw_core_init); |