diff --git a/[refs] b/[refs] index 0f44bafdd843..b0be3e06602c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6734fe57a07b2dd23ef1ef2ac1f790747e53eefc +refs/heads/master: 95cf3e12e7f659e536215b37c67d46f3e2ce95cc diff --git a/trunk/drivers/acpi/reboot.c b/trunk/drivers/acpi/reboot.c index 4870aaaa2ae1..a6c77e8b37bd 100644 --- a/trunk/drivers/acpi/reboot.c +++ b/trunk/drivers/acpi/reboot.c @@ -15,6 +15,11 @@ void acpi_reboot(void) rr = &acpi_gbl_FADT.reset_register; + /* ACPI reset register was only introduced with v2 of the FADT */ + + if (acpi_gbl_FADT.header.revision < 2) + return; + /* Is the reset register supported? The spec says we should be * checking the bit width and bit offset, but Windows ignores * these fields */