From df6532aef0a5708452161e9fe786e5f863912a80 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg@redhat.com>
Date: Fri, 11 Mar 2011 16:12:20 -0500
Subject: [PATCH] --- yaml --- r: 241713 b: refs/heads/master c:
 95cf3e12e7f659e536215b37c67d46f3e2ce95cc h: refs/heads/master i:   241711:
 24be28de7b92ef78341f148d361f5bd55f56c810 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/acpi/reboot.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

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 */