From f21271edb5406577dc0a062ce3068ef17a09309d Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Thu, 16 Oct 2014 18:00:27 +0200 Subject: Fix mismerge of ACPI patches Change-Id: I2a9960861465f4686113213d5e5793333b6274b2 Signed-off-by: Vladimir Serbinenko Reviewed-on: http://review.coreboot.org/7079 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/southbridge/via/k8t890/traf_ctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/southbridge/via') diff --git a/src/southbridge/via/k8t890/traf_ctrl.c b/src/southbridge/via/k8t890/traf_ctrl.c index 6eb8e9711f..bff4ac7546 100644 --- a/src/southbridge/via/k8t890/traf_ctrl.c +++ b/src/southbridge/via/k8t890/traf_ctrl.c @@ -125,7 +125,7 @@ static void traf_ctrl_enable_k8t890(struct device *dev) pci_write_config8(dev, 0x60, 0x80 | reg); } -#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) static void southbridge_acpi_fill_ssdt_generator(void) { amd_model_fxx_generate_powernow(0, 0, 0); @@ -139,7 +139,7 @@ static const struct device_operations traf_ctrl_ops_m = { .set_resources = mmconfig_set_resources, .enable_resources = pci_dev_enable_resources, .enable = traf_ctrl_enable_k8m890, -#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) .write_acpi_tables = acpi_write_hpet, .acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator, #endif @@ -151,7 +151,7 @@ static const struct device_operations traf_ctrl_ops_t = { .set_resources = mmconfig_set_resources, .enable_resources = pci_dev_enable_resources, .enable = traf_ctrl_enable_k8t890, -#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) .write_acpi_tables = acpi_write_hpet, #endif .ops_pci = 0, -- cgit v1.2.3