Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / pci / hotplug / acpi_pcihp.c

diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c
index 3bc72d1..8f3faf3 100644 (file)
--- a/drivers/pci/hotplug/acpi_pcihp.c
+++ b/drivers/pci/hotplug/acpi_pcihp.c
@@ -351,7 +351,7 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *pdev, u32 flags)
         * To handle different BIOS behavior, we look for _OSC on a root
         * bridge preferentially (according to PCI fw spec). Later for
         * OSHP within the scope of the hotplug controller and its parents,
-        * upto the host bridge under which this controller exists.
+        * up to the host bridge under which this controller exists.
         */
        handle = acpi_find_root_bridge_handle(pdev);
        if (handle) {