ACPI: fix build warnings resulting from merge window conflict