From a793162b9da192a2291294a1ee13814b47aa62c4 Mon Sep 17 00:00:00 2001
From: Vegard Nossum <vegard.nossum@gmail.com>
Date: Fri, 20 Jun 2008 15:39:09 +0200
Subject: [PATCH] --- yaml --- r: 101999 b: refs/heads/master c:
 d1857056904d5f313f11184fcfa624652ff9620a h: refs/heads/master i:   101997:
 5d3150761cec4c96aefd5afcdcad0055a3bf6e38   101995:
 46e47f158718170984ee9919b41bc00df4d95c86   101991:
 c9afa287b7a0e76f45b43cd2c437025be16ebf1e   101983:
 85851dc07402bc70615e6a02a0b2b19a1b63fa87 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/acpi/glue.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4156eca413d4..0855bbe23c8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 860f0c6b3dcaa455894f690647442dc97cab19c8
+refs/heads/master: d1857056904d5f313f11184fcfa624652ff9620a
diff --git a/trunk/drivers/acpi/glue.c b/trunk/drivers/acpi/glue.c
index 9b227d4dc9c9..6d18ca34b6aa 100644
--- a/trunk/drivers/acpi/glue.c
+++ b/trunk/drivers/acpi/glue.c
@@ -333,6 +333,9 @@ static int __init acpi_rtc_init(void)
 {
 	struct device *dev = get_rtc_dev();
 
+	if (acpi_disabled)
+		return 0;
+
 	if (acpi_disabled)
 		return 0;