diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 19:25:38 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 19:25:38 +0100 |
| commit | 64106104dd2d4a6280777e88c1cbf9f7a52c30bd (patch) | |
| tree | 082ed0f5e8be5390e867e4078e6813c509c5e642 /drivers/ieee1394/hosts.h | |
| parent | [PATCH] kbuild: more Makefile cleanups (diff) | |
| parent | ieee1394: fix host device registering when nodemgr disabled (diff) | |
| download | linux-64106104dd2d4a6280777e88c1cbf9f7a52c30bd.tar.xz linux-64106104dd2d4a6280777e88c1cbf9f7a52c30bd.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: fix host device registering when nodemgr disabled
ieee1394: video1394: DMA fix
ieee1394: raw1394: prevent unloading of low-level driver
ieee1394: dv1394: tidy up card removal
ieee1394: dv1394: fix CardBus card ejection
ieee1394: sbp2: lower block queue alignment requirement
ieee1394: sbp2: remove bogus "emulated" host flag
ieee1394: save one word in struct hpsb_host
ieee1394: restore config ROM when resuming
ieee1394: ohci1394: drop pcmcia-cs compatibility code
ieee1394: nodemgr: check info_length in ROM header earlier
the scheduled IEEE1394_OUI_DB removal
the scheduled IEEE1394_EXPORT_FULL_API removal
ieee1394: sbp2: use a better wildcard for blacklist
Add PCI class ID for firewire OHCI controllers.
ieee1394: modified csr1212_key_id_type_map to support lisight
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 |