commit 1ae22af7d750fbf665b7651fcbd3c15cc2d3793b
author Len Brown <len.brown@intel.com> Wed Dec 30 02:51:01 2009 -0500
committer Len Brown <len.brown@intel.com> Wed Dec 30 02:51:01 2009 -0500
tree b1d7da8679c6730fdc98d531d544743f23d26c9f
parent 27d0567ab635bc2af11be48f91c8d5a7a2dca2e4
parent d1f9e4970742bb1e22d07b01bd44f9c357d25c42

Merge branch 'wmi' into release

drivers/char/ipmi/ipmi_si_intf.c

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 679cd08..176f175 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -3204,7 +3204,7 @@
 #ifdef CONFIG_ACPI
 	spmi_find_bmc();
 #endif
-#ifdef CONFIG_PNP
+#ifdef CONFIG_ACPI
 	pnp_register_driver(&ipmi_pnp_driver);
 #endif
 
@@ -3330,7 +3330,7 @@
 #ifdef CONFIG_PCI
 	pci_unregister_driver(&ipmi_pci_driver);
 #endif
-#ifdef CONFIG_PNP
+#ifdef CONFIG_ACPI
 	pnp_unregister_driver(&ipmi_pnp_driver);
 #endif