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;