aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-07-17 20:07:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-20 20:14:57 -0400
commit5e248ac9a5c465b356b936030d5a2e80887eb266 (patch)
tree205f2ba1f0517b7f7cff193a9eb1331c035f723c /drivers
parent392798a17b6afba5928bc577aeb7bc83a1585534 (diff)
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>
Diffstat (limited to 'drivers')
-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 0f2dd81736bd..2f173e83f8a7 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -338,9 +338,6 @@ static int __init acpi_rtc_init(void)
338 if (acpi_disabled) 338 if (acpi_disabled)
339 return 0; 339 return 0;
340 340
341 if (acpi_disabled)
342 return 0;
343
344 if (dev) { 341 if (dev) {
345 rtc_wake_setup(); 342 rtc_wake_setup();
346 rtc_info.wake_on = rtc_wake_on; 343 rtc_info.wake_on = rtc_wake_on;