Messages in this thread Patch in this message | | | Date | Tue, 11 Dec 2007 20:14:40 -0800 | From | Yinghai Lu <> | Subject | [PATCH] pci: don't load acpi_php when acpi is disabled |
| |
[PATCH] pci: don't load acpi_php when acpi is disabled
when acpi=off and pci=nomsi, don't load acpiphp
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c index c8c2638..84d66ba 100644 --- a/drivers/pci/hotplug/acpiphp_core.c +++ b/drivers/pci/hotplug/acpiphp_core.c @@ -392,6 +392,9 @@ static int __init acpiphp_init(void) { info(DRIVER_DESC " version: " DRIVER_VERSION "\n"); + if (acpi_pci_disabled) + return 0; + acpiphp_debug = debug; /* read all the ACPI info from the system */ @@ -401,6 +404,9 @@ static int __init acpiphp_init(void) static void __exit acpiphp_exit(void) { + if (acpi_pci_disabled) + return 0; + /* deallocate internal data structures etc. */ acpiphp_glue_exit(); }
| |