From 5e248ac9a5c465b356b936030d5a2e80887eb266 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
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 <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---
drivers/acpi/glue.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 0f2dd81736bd..2f173e83f8a7 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -335,9 +335,6 @@ static int __init acpi_rtc_init(void)
{
struct device *dev = get_rtc_dev();
- if (acpi_disabled)
- return 0;
-
if (acpi_disabled)
return 0;
--
2.20.1