aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/ipmi/ipmi_si_intf.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index beea450ee4b2..c67ef3e47ad5 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -1056,7 +1056,7 @@ MODULE_PARM_DESC(slave_addrs, "Set the default IPMB slave address for"
1056#define IPMI_MEM_ADDR_SPACE 1 1056#define IPMI_MEM_ADDR_SPACE 1
1057#define IPMI_IO_ADDR_SPACE 2 1057#define IPMI_IO_ADDR_SPACE 2
1058 1058
1059#if defined(CONFIG_ACPI) || defined(CONFIG_X86) || defined(CONFIG_PCI) 1059#if defined(CONFIG_ACPI) || defined(CONFIG_DMI) || defined(CONFIG_PCI)
1060static int is_new_interface(int intf, u8 addr_space, unsigned long base_addr) 1060static int is_new_interface(int intf, u8 addr_space, unsigned long base_addr)
1061{ 1061{
1062 int i; 1062 int i;
@@ -1669,7 +1669,7 @@ static int try_init_acpi(int intf_num, struct smi_info **new_info)
1669} 1669}
1670#endif 1670#endif
1671 1671
1672#ifdef CONFIG_X86 1672#ifdef CONFIG_DMI
1673typedef struct dmi_ipmi_data 1673typedef struct dmi_ipmi_data
1674{ 1674{
1675 u8 type; 1675 u8 type;
@@ -1829,7 +1829,7 @@ static int try_init_smbios(int intf_num, struct smi_info **new_info)
1829 ipmi_data->slave_addr); 1829 ipmi_data->slave_addr);
1830 return 0; 1830 return 0;
1831} 1831}
1832#endif /* CONFIG_X86 */ 1832#endif /* CONFIG_DMI */
1833 1833
1834#ifdef CONFIG_PCI 1834#ifdef CONFIG_PCI
1835 1835
@@ -2222,7 +2222,7 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
2222 if (rv && si_trydefaults) 2222 if (rv && si_trydefaults)
2223 rv = try_init_acpi(intf_num, &new_smi); 2223 rv = try_init_acpi(intf_num, &new_smi);
2224#endif 2224#endif
2225#ifdef CONFIG_X86 2225#ifdef CONFIG_DMI
2226 if (rv && si_trydefaults) 2226 if (rv && si_trydefaults)
2227 rv = try_init_smbios(intf_num, &new_smi); 2227 rv = try_init_smbios(intf_num, &new_smi);
2228#endif 2228#endif
@@ -2433,7 +2433,7 @@ static __init int init_ipmi_si(void)
2433 2433
2434 printk(KERN_INFO "IPMI System Interface driver.\n"); 2434 printk(KERN_INFO "IPMI System Interface driver.\n");
2435 2435
2436#ifdef CONFIG_X86 2436#ifdef CONFIG_DMI
2437 dmi_find_bmc(); 2437 dmi_find_bmc();
2438#endif 2438#endif
2439 2439