Merge tag 'pci-v3.16-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / pci / hotplug / acpiphp_glue.c

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 91aa3d780138ee85f5033ecc80402201b4181bce..602d153c7055b0227416c2d960a1efe4688aa847 100644 (file)
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -351,11 +351,9 @@ static acpi_status acpiphp_add_context(acpi_handle handle, u32 lvl, void *data,
                        slot->slot = NULL;
                        bridge->nr_slots--;
                        if (retval == -EBUSY)
-                               pr_warn("Slot %llu already registered by another "
-                                       "hotplug driver\n", sun);
+                               pr_warn("Slot %llu already registered by another hotplug driver\n", sun);
                        else
-                               pr_warn("acpiphp_register_hotplug_slot failed "
-                                       "(err code = 0x%x)\n", retval);
+                               pr_warn("acpiphp_register_hotplug_slot failed (err code = 0x%x)\n", retval);
                }
                /* Even if the slot registration fails, we can still use it. */
        }