From: Andrew Morton <akpm@linux-foundation.org>

Cc: Greg KH <greg@kroah.com>
Cc: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Cc: Yinghai Lu <Yinghai.Lu@Sun.COM>
Cc: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/pci/hotplug/acpiphp_core.c |    2 +-
 x86/kernel/acpi/boot.c             |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/pci/hotplug/acpiphp_core.c~pci-dont-load-acpi_php-when-acpi-is-disabled-fix drivers/pci/hotplug/acpiphp_core.c
--- a/drivers/pci/hotplug/acpiphp_core.c~pci-dont-load-acpi_php-when-acpi-is-disabled-fix
+++ a/drivers/pci/hotplug/acpiphp_core.c
@@ -405,7 +405,7 @@ static int __init acpiphp_init(void)
 static void __exit acpiphp_exit(void)
 {
 	if (acpi_pci_disabled)
-		return 0;
+		return;
 
 	/* deallocate internal data structures etc. */
 	acpiphp_glue_exit();
diff -puN arch/x86/kernel/acpi/boot.c~pci-dont-load-acpi_php-when-acpi-is-disabled-fix arch/x86/kernel/acpi/boot.c
_