Subject: ipmi: check, if default ports are accessible on PPC

From: Christian Krafft <krafft@de.ibm.com>

ipmi_si_intf tries to access default ports, if no device could
be found elsewhere. On PPC we have a function to check,
if these legacy IO ports are accessible. This patch adds
a check for these ports on PPC.
This patch fixes a breakage of IPMI module
on PPC machines without a BMC.

Signed-off-by: Christian Krafft <krafft@de.ibm.com>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>

Index: linux-2.6/drivers/char/ipmi/ipmi_si_intf.c
===================================================================
--- linux-2.6.orig/drivers/char/ipmi/ipmi_si_intf.c
+++ linux-2.6/drivers/char/ipmi/ipmi_si_intf.c
@@ -2480,6 +2480,11 @@ static __devinit void default_find_bmc(v
 		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;