diff options
author | Len Brown <len.brown@intel.com> | 2011-07-16 18:14:21 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2011-08-03 11:15:59 -0400 |
commit | a7e09d450b2e0b068e850d103b6ee1af537d1910 (patch) | |
tree | b38756299aeb751ea88a143560ceae0241471dc6 /drivers/acpi/bus.c | |
parent | ba61ca4aab47441f1c6cec28a9a6aa0489fd1df3 (diff) |
ACPI: APEI build fix
as GHES is optional...
When # CONFIG_ACPI_APEI_GHES is not set:
(.init.text+0x4c22): undefined reference to `ghes_disable'
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/bus.c')
-rw-r--r-- | drivers/acpi/bus.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 43ce3b0c4921..437ddbf0c49a 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
@@ -544,10 +544,8 @@ static void acpi_bus_osc_support(void) | |||
544 | capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PPC_OST_SUPPORT; | 544 | capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PPC_OST_SUPPORT; |
545 | #endif | 545 | #endif |
546 | 546 | ||
547 | #ifdef CONFIG_ACPI_APEI_GHES | ||
548 | if (!ghes_disable) | 547 | if (!ghes_disable) |
549 | capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_APEI_SUPPORT; | 548 | capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_APEI_SUPPORT; |
550 | #endif | ||
551 | if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle))) | 549 | if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle))) |
552 | return; | 550 | return; |
553 | if (ACPI_SUCCESS(acpi_run_osc(handle, &context))) { | 551 | if (ACPI_SUCCESS(acpi_run_osc(handle, &context))) { |