diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 22:45:43 +0300 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 22:45:43 +0300 |
| commit | 81b7bbd1932a04869d4c8635a75222dfc6089f96 (patch) | |
| tree | 285ae868a1e3a41fb0dbfe346c28e380949bcb55 /drivers/ieee1394/hosts.h | |
| parent | 98051995ab44b993f992946055edc6115351f725 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
| download | linux-81b7bbd1932a04869d4c8635a75222dfc6089f96.tar.xz | |
Merge branch 'linus'
Conflicts:
drivers/scsi/ipr.c
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
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 { struct device device; struct class_device class_dev; - int update_config_rom; struct delayed_work delayed_reset; - unsigned int config_roms; + unsigned config_roms:31; + unsigned update_config_rom:1; struct list_head addr_space; u64 low_addr_space; /* upper bound of physical DMA area */ @@ -200,7 +200,8 @@ struct hpsb_host_driver { struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra, struct device *dev); int hpsb_add_host(struct hpsb_host *host); -void hpsb_remove_host(struct hpsb_host *h); +void hpsb_resume_host(struct hpsb_host *host); +void hpsb_remove_host(struct hpsb_host *host); /* Updates the configuration rom image of a host. rom_version must be the * current version, otherwise it will fail with return value -1. If this |