1 files changed, 12 insertions, 11 deletions

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 9b9e1e915cf6..5b7bf7d22494 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -3306,17 +3306,6 @@ static __devinit int init_ipmi_si(void)
         }
         mutex_unlock(&smi_infos_lock);
 
-#ifdef CONFIG_DMI
-        dmi_find_bmc();
-#endif
-
-#ifdef CONFIG_ACPI
-        spmi_find_bmc();
-#endif
-#ifdef CONFIG_ACPI
-        pnp_register_driver(&ipmi_pnp_driver);
-#endif
-
 #ifdef CONFIG_PCI
         rv = pci_register_driver(&ipmi_pci_driver);
         if (rv)
@@ -3325,6 +3314,18 @@ static __devinit int init_ipmi_si(void)
                        rv);
 #endif
 
+#ifdef CONFIG_ACPI
+        pnp_register_driver(&ipmi_pnp_driver);
+#endif
+
+#ifdef CONFIG_DMI
+        dmi_find_bmc();
+#endif
+
+#ifdef CONFIG_ACPI
+        spmi_find_bmc();
+#endif
+
 #ifdef CONFIG_PPC_OF
         of_register_platform_driver(&ipmi_of_platform_driver);
 #endif