aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2008-07-18 09:12:49 +0200
committerAndi Kleen <ak@linux.intel.com>2008-07-18 09:12:49 +0200
commit725c3a2d70f958adee807c178178819a50f68a56 (patch)
tree975b557c429466931e5817a8d939906d172d2757 /drivers/acpi
parent97d2ef56863c367158d515173aa5062656072229 (diff)
downloadkernel_samsung_aries-725c3a2d70f958adee807c178178819a50f68a56.zip
kernel_samsung_aries-725c3a2d70f958adee807c178178819a50f68a56.tar.gz
kernel_samsung_aries-725c3a2d70f958adee807c178178819a50f68a56.tar.bz2
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.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 0f2dd81..2f173e8 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;