X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Facpi%2Fglue.c;h=9b227d4dc9c9bbd43b7649b66b7ee311371f7eaf;hb=77b96bd7e5ee0b44aed1b77fef5949bc19e8301f;hp=2808dc60fd670065a94ddf4c0be90876fd3fc20a;hpb=c907310fb0a5dd69a7fe11c08368abb0d34a35cb;p=linux-2.6

diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 2808dc60fd..9b227d4dc9 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 (dev) {
 		rtc_wake_setup();
 		rtc_info.wake_on = rtc_wake_on;