From: Kevin O'Connor Date: Fri, 20 Jul 2012 06:42:08 +0000 (-0400) Subject: Fix merge of a4e2b9adbba95c2d783761e84444bbb3c8d6107b. X-Git-Tag: rel-1.7.1~14 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=afdeda03e078a9c6f586479716f911c40f3511b7;p=seabios.git Fix merge of a4e2b9adbba95c2d783761e84444bbb3c8d6107b. The manual merge of a4e2b9ad that I did resulted in previous commits (c7be281b and 20fcf9b) being undone. Fix that up. Signed-off-by: Kevin O'Connor --- diff --git a/src/acpi.c b/src/acpi.c index 9071bd4..d39cbd9 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -294,8 +294,8 @@ build_fadt(struct pci_device *pci) fadt->plvl2_lat = cpu_to_le16(0xfff); // C2 state not supported fadt->plvl3_lat = cpu_to_le16(0xfff); // C3 state not supported pci_init_device(fadt_init_tbl, pci, fadt); - /* WBINVD + PROC_C1 + SLP_BUTTON + FIX_RTC + USE_PLATFORM_CLOCK */ - fadt->flags = cpu_to_le32((1 << 0) | (1 << 2) | (1 << 5) | (1 << 6) | + /* WBINVD + PROC_C1 + SLP_BUTTON + RTC_S4 + USE_PLATFORM_CLOCK */ + fadt->flags = cpu_to_le32((1 << 0) | (1 << 2) | (1 << 5) | (1 << 7) | (1 << 15)); build_header((void*)fadt, FACP_SIGNATURE, sizeof(*fadt), 1);