diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-07-18 02:07:02 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 02:14:57 +0200 |
| commit | 5e248ac9a5c465b356b936030d5a2e80887eb266 (patch) | |
| tree | 205f2ba1f0517b7f7cff193a9eb1331c035f723c | |
| parent | APCI: revert duplicated patch (diff) | |
| download | linux-5e248ac9a5c465b356b936030d5a2e80887eb266.tar.xz linux-5e248ac9a5c465b356b936030d5a2e80887eb266.zip | |
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>
| -rw-r--r-- | drivers/acpi/glue.c | 3 |
1 files changed, 0 insertions, 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 @@ -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; |