1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index a7b33d2f5991..e22146546add 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2478,6 +2478,11 @@ static __devinit void default_find_bmc(void)
                 if (!info)
                         return;
 
+#ifdef CONFIG_PPC_MERGE
+                if (check_legacy_ioport(ipmi_defaults[i].port))
+                        continue;
+#endif
+
                 info->addr_source = NULL;
 
                 info->si_type = ipmi_defaults[i].type;