---

yaml --- r: 101999 b: refs/heads/master c: d185705 h: refs/heads/master i: 101997: 5d31507 101995: 46e47f1 101991: c9afa28 101983: 85851dc v: v3
git-mirror · Jul 16, 2008 · a793162 · a793162
1 parent aa77bc0
commit a793162
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;