diff options
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index a44b97304e95..c51b02d9dfd0 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
@@ -986,7 +986,7 @@ MODULE_PARM_DESC(slave_addrs, "Set the default IPMB slave address for" | |||
986 | #define IPMI_MEM_ADDR_SPACE 1 | 986 | #define IPMI_MEM_ADDR_SPACE 1 |
987 | #define IPMI_IO_ADDR_SPACE 2 | 987 | #define IPMI_IO_ADDR_SPACE 2 |
988 | 988 | ||
989 | #if defined(CONFIG_ACPI_INTERPRETER) || defined(CONFIG_X86) || defined(CONFIG_PCI) | 989 | #if defined(CONFIG_ACPI) || defined(CONFIG_X86) || defined(CONFIG_PCI) |
990 | static int is_new_interface(int intf, u8 addr_space, unsigned long base_addr) | 990 | static int is_new_interface(int intf, u8 addr_space, unsigned long base_addr) |
991 | { | 991 | { |
992 | int i; | 992 | int i; |
@@ -1362,7 +1362,7 @@ static int try_init_mem(int intf_num, struct smi_info **new_info) | |||
1362 | } | 1362 | } |
1363 | 1363 | ||
1364 | 1364 | ||
1365 | #ifdef CONFIG_ACPI_INTERPRETER | 1365 | #ifdef CONFIG_ACPI |
1366 | 1366 | ||
1367 | #include <linux/acpi.h> | 1367 | #include <linux/acpi.h> |
1368 | 1368 | ||
@@ -2067,7 +2067,7 @@ static int init_one_smi(int intf_num, struct smi_info **smi) | |||
2067 | rv = try_init_mem(intf_num, &new_smi); | 2067 | rv = try_init_mem(intf_num, &new_smi); |
2068 | if (rv) | 2068 | if (rv) |
2069 | rv = try_init_port(intf_num, &new_smi); | 2069 | rv = try_init_port(intf_num, &new_smi); |
2070 | #ifdef CONFIG_ACPI_INTERPRETER | 2070 | #ifdef CONFIG_ACPI |
2071 | if ((rv) && (si_trydefaults)) { | 2071 | if ((rv) && (si_trydefaults)) { |
2072 | rv = try_init_acpi(intf_num, &new_smi); | 2072 | rv = try_init_acpi(intf_num, &new_smi); |
2073 | } | 2073 | } |