diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2002-07-23 21:56:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2002-07-23 21:56:39 -0700 |
| commit | 01bb34401dce1bbc2fd1b299595148aabdb46e99 (patch) | |
| tree | 8758dca779a6bd88a7e12f89565b6fd91b98d9a6 /drivers/hotplug/ibmphp_core.c | |
| parent | 3b89dbbd78bb638c2691c5752ed0d54fd1a73fa1 (diff) | |
| parent | a36a2ed39e7baa8df0570dceef206914e360a740 (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleeding_edge-2.5
into kroah.com:/home/greg/linux/BK/pci_hp-2.5
Diffstat (limited to 'drivers/hotplug/ibmphp_core.c')
| -rw-r--r-- | drivers/hotplug/ibmphp_core.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/hotplug/ibmphp_core.c b/drivers/hotplug/ibmphp_core.c index 05e092126a3e..87234e42f58e 100644 --- a/drivers/hotplug/ibmphp_core.c +++ b/drivers/hotplug/ibmphp_core.c @@ -893,12 +893,12 @@ static int ibm_unconfigure_visit_pci_dev_phase1 (struct pci_dev_wrapped *wrapped } static struct pci_visit ibm_unconfigure_functions_phase1 = { - post_visit_pci_dev: ibm_unconfigure_visit_pci_dev_phase1, + .post_visit_pci_dev = ibm_unconfigure_visit_pci_dev_phase1, }; static struct pci_visit ibm_unconfigure_functions_phase2 = { - post_visit_pci_bus: ibm_unconfigure_visit_pci_bus_phase2, - post_visit_pci_dev: ibm_unconfigure_visit_pci_dev_phase2, + .post_visit_pci_bus = ibm_unconfigure_visit_pci_bus_phase2, + .post_visit_pci_dev = ibm_unconfigure_visit_pci_dev_phase2, }; static int ibm_unconfigure_device (struct pci_func *func) @@ -962,7 +962,7 @@ static int configure_visit_pci_dev (struct pci_dev_wrapped *wrapped_dev, struct } static struct pci_visit configure_functions = { - visit_pci_dev: configure_visit_pci_dev, + .visit_pci_dev =configure_visit_pci_dev, }; static int ibm_configure_device (struct pci_func *func) @@ -1494,19 +1494,19 @@ int ibmphp_disable_slot (struct hotplug_slot *hotplug_slot) } struct hotplug_slot_ops ibmphp_hotplug_slot_ops = { - owner: THIS_MODULE, - set_attention_status: set_attention_status, - enable_slot: enable_slot, - disable_slot: ibmphp_disable_slot, - hardware_test: NULL, - get_power_status: get_power_status, - get_attention_status: get_attention_status, - get_latch_status: get_latch_status, - get_adapter_status: get_adapter_present, + .owner = THIS_MODULE, + .set_attention_status = set_attention_status, + .enable_slot = enable_slot, + .disable_slot = ibmphp_disable_slot, + .hardware_test = NULL, + .get_power_status = get_power_status, + .get_attention_status = get_attention_status, + .get_latch_status = get_latch_status, + .get_adapter_status = get_adapter_present, /* get_max_bus_speed_status: get_max_bus_speed, - get_max_adapter_speed_status: get_max_adapter_speed, - get_cur_bus_speed_status: get_cur_bus_speed, - get_card_bus_names_status: get_card_bus_names, + .get_max_adapter_speed_status = get_max_adapter_speed, + .get_cur_bus_speed_status = get_cur_bus_speed, + .get_card_bus_names_status = get_card_bus_names, */ }; |