diff options
| author | Andi Kleen <ak@linux.intel.com> | 2008-07-18 09:12:49 +0200 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2008-07-18 09:12:49 +0200 |
| commit | 725c3a2d70f958adee807c178178819a50f68a56 (patch) | |
| tree | 975b557c429466931e5817a8d939906d172d2757 /drivers/acpi | |
| parent | Merge branch 'merge' into release-2.6.27 (diff) | |
| download | linux-725c3a2d70f958adee807c178178819a50f68a56.tar.xz linux-725c3a2d70f958adee807c178178819a50f68a56.zip | |
Revert "ACPI: don't walk tables if ACPI was disabled"
This reverts commit d1857056904d5f313f11184fcfa624652ff9620a.
Double commit, noticed by Thomas Gleixner.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'drivers/acpi')
| -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; |