diff options
Diffstat (limited to 'drivers/ieee1394/hosts.h')
-rw-r--r-- | drivers/ieee1394/hosts.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ieee1394/hosts.h b/drivers/ieee1394/hosts.h index d553e38c9543..4bf4fb7f67b7 100644 --- a/drivers/ieee1394/hosts.h +++ b/drivers/ieee1394/hosts.h | |||
@@ -61,9 +61,9 @@ struct hpsb_host { | |||
61 | struct device device; | 61 | struct device device; |
62 | struct class_device class_dev; | 62 | struct class_device class_dev; |
63 | 63 | ||
64 | int update_config_rom; | ||
65 | struct delayed_work delayed_reset; | 64 | struct delayed_work delayed_reset; |
66 | unsigned int config_roms; | 65 | unsigned config_roms:31; |
66 | unsigned update_config_rom:1; | ||
67 | 67 | ||
68 | struct list_head addr_space; | 68 | struct list_head addr_space; |
69 | u64 low_addr_space; /* upper bound of physical DMA area */ | 69 | u64 low_addr_space; /* upper bound of physical DMA area */ |
@@ -200,7 +200,8 @@ struct hpsb_host_driver { | |||
200 | struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra, | 200 | struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra, |
201 | struct device *dev); | 201 | struct device *dev); |
202 | int hpsb_add_host(struct hpsb_host *host); | 202 | int hpsb_add_host(struct hpsb_host *host); |
203 | void hpsb_remove_host(struct hpsb_host *h); | 203 | void hpsb_resume_host(struct hpsb_host *host); |
204 | void hpsb_remove_host(struct hpsb_host *host); | ||
204 | 205 | ||
205 | /* Updates the configuration rom image of a host. rom_version must be the | 206 | /* Updates the configuration rom image of a host. rom_version must be the |
206 | * current version, otherwise it will fail with return value -1. If this | 207 | * current version, otherwise it will fail with return value -1. If this |