]> err.no Git - linux-2.6/commitdiff
APCI: revert another duplicated patch
authorThomas Gleixner <tglx@linutronix.de>
Fri, 18 Jul 2008 00:07:02 +0000 (02:07 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Jul 2008 00:14:57 +0000 (17:14 -0700)
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

index 0f2dd81736bda796c8ace56f1f216edca65f88fd..2f173e83f8a76bf0291f93689fe075d3fb4e7edf 100644 (file)
@@ -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;