X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=drivers%2Facpi%2Fglue.c;h=6d18ca34b6aa737f49deeca27982252ad1d3d076;hb=d1857056904d5f313f11184fcfa624652ff9620a;hp=9b227d4dc9c9bbd43b7649b66b7ee311371f7eaf;hpb=3b5c6b834984b09b7b7fba6a97d3a2878a4a8e42;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 9b227d4dc9c..6d18ca34b6a 100644
--- a/drivers/acpi/glue.c
+++ b/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;