Commit a51ae743 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] IPMI build fix

From: Adrian Bunk <bunk@fs.tum.de>

Fix ACPI compile error if doing processor probing only: acpi_find_bmc is
only available #ifdef CONFIG_ACPI_INTERPRETER.
parent 4c0c1725
...@@ -1016,7 +1016,7 @@ static int init_one_kcs(int kcs_port, ...@@ -1016,7 +1016,7 @@ static int init_one_kcs(int kcs_port,
return rv; return rv;
} }
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI_INTERPRETER
/* Retrieve the base physical address from ACPI tables. Originally /* Retrieve the base physical address from ACPI tables. Originally
from Hewlett-Packard simple bmc.c, a GPL KCS driver. */ from Hewlett-Packard simple bmc.c, a GPL KCS driver. */
...@@ -1072,7 +1072,7 @@ static __init int init_ipmi_kcs(void) ...@@ -1072,7 +1072,7 @@ static __init int init_ipmi_kcs(void)
int rv = 0; int rv = 0;
int pos = 0; int pos = 0;
int i = 0; int i = 0;
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI_INTERPRETER
unsigned long physaddr = 0; unsigned long physaddr = 0;
#endif #endif
...@@ -1102,7 +1102,7 @@ static __init int init_ipmi_kcs(void) ...@@ -1102,7 +1102,7 @@ static __init int init_ipmi_kcs(void)
(because they weren't already specified above). */ (because they weren't already specified above). */
if (kcs_trydefaults) { if (kcs_trydefaults) {
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI_INTERPRETER
if ((physaddr = acpi_find_bmc())) { if ((physaddr = acpi_find_bmc())) {
if (!check_mem_region(physaddr, 2)) { if (!check_mem_region(physaddr, 2)) {
rv = init_one_kcs(0, rv = init_one_kcs(0,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment