From 5e248ac9a5c465b356b936030d5a2e80887eb266 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 18 Jul 2008 02:07:02 +0200 Subject: [PATCH] APCI: revert another duplicated patch commit d1857056904d5f313f11184fcfa624652ff9620a ("ACPI: don't walk tables if ACPI was disabled") is another superfluous duplicate commit caused by git -> quilt -> git conversion. Revert it. Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds --- drivers/acpi/glue.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 0f2dd81..2f173e8 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c @@ -338,9 +338,6 @@ static int __init acpi_rtc_init(void) if (acpi_disabled) return 0; - if (acpi_disabled) - return 0; - if (dev) { rtc_wake_setup(); rtc_info.wake_on = rtc_wake_on; -- 2.7.4