0da9b7818e
breaks building this config, as the old ACPI code will conflict. The old code will be going away shortly, so this should not be an issue.