diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2003-02-26 21:49:57 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2003-02-26 21:49:57 -0800 |
| commit | fffd915522cb703e95381fc52c0ac3843f013f18 (patch) | |
| tree | 7efd17b1bd1a584a7fa10633d26b4b5e99283deb /drivers/hotplug/ibmphp_core.c | |
| parent | a6cc5237a1f189c30cd06d05e2955e5bc63d8913 (diff) | |
| parent | be8013e867207d570f33cc1c66bd06797f1eed6b (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleed-2.5
into kroah.com:/home/greg/linux/BK/pci-2.5
Diffstat (limited to 'drivers/hotplug/ibmphp_core.c')
| -rw-r--r-- | drivers/hotplug/ibmphp_core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hotplug/ibmphp_core.c b/drivers/hotplug/ibmphp_core.c index 54bb89f0014b..74d9fd4ca029 100644 --- a/drivers/hotplug/ibmphp_core.c +++ b/drivers/hotplug/ibmphp_core.c @@ -1122,12 +1122,12 @@ static int enable_slot (struct hotplug_slot *hs) } /* Check to see the error of why it failed */ if ((SLOT_POWER (slot_cur->status)) && !(SLOT_PWRGD (slot_cur->status))) - err ("power fault occured trying to power up \n"); + err ("power fault occurred trying to power up \n"); else if (SLOT_BUS_SPEED (slot_cur->status)) { - err ("bus speed mismatch occured. please check current bus speed and card capability \n"); + err ("bus speed mismatch occurred. please check current bus speed and card capability \n"); print_card_capability (slot_cur); } else if (SLOT_BUS_MODE (slot_cur->ext_status)) { - err ("bus mode mismatch occured. please check current bus mode and card capability \n"); + err ("bus mode mismatch occurred. please check current bus mode and card capability \n"); print_card_capability (slot_cur); } ibmphp_update_slot_info (slot_cur); @@ -1145,11 +1145,11 @@ static int enable_slot (struct hotplug_slot *hs) rc = -EINVAL; if (SLOT_POWER (slot_cur->status) && !(SLOT_PWRGD (slot_cur->status))) { - err ("power fault occured trying to power up... \n"); + err ("power fault occurred trying to power up... \n"); goto error_power; } if (SLOT_POWER (slot_cur->status) && (SLOT_BUS_SPEED (slot_cur->status))) { - err ("bus speed mismatch occured. please check current bus speed and card capability \n"); + err ("bus speed mismatch occurred. please check current bus speed and card capability \n"); print_card_capability (slot_cur); goto error_power; } |