Re: [PATCH] Revert duplicate "ACPI: don't walk tables if ACPI wasdisabled" commit (was: Please pull ACPI updates)

From: Thomas Gleixner
Date: Thu Jul 17 2008 - 20:08:20 EST


On Fri, 18 Jul 2008, Thomas Gleixner wrote:
>
> Please revert the one I happened to notice. Patch below.

Another one.

Thanks,

tglx

----------->
Subject: APCI: revert another duplicated patch
From: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

commit d1857056904d5f313f11184fcfa624652ff9620a

is another superfluous duplicate commit caused by
git -> quilt -> git conversion.

Revert it.

Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

---
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 6d18ca3..9b227d4 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -336,9 +336,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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/