diff options
| author | Vladimir Serbinenko <phcoder@gmail.com> | 2014-10-16 18:00:27 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2014-10-17 09:31:28 +0200 |
| commit | f21271edb5406577dc0a062ce3068ef17a09309d (patch) | |
| tree | 7ed818dd82644d61178d105ccbf277e787510ffb /src/southbridge/via | |
| parent | 833bf20f92c38e8e3dfee12d3b81d47bcd35d906 (diff) | |
Fix mismerge of ACPI patches
Change-Id: I2a9960861465f4686113213d5e5793333b6274b2
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/7079
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/southbridge/via')
| -rw-r--r-- | src/southbridge/via/k8t890/traf_ctrl.c | 6 |
1 files changed, 3 insertions, 3 deletions
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, |