[folded] x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs-v2.patch removed from -mm tree

[folded] x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs-v2.patch removed from -mm tree

[akpm]

The patch titled
     Subject: x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs-v2
has been removed from the -mm tree.  Its filename was
     x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs-v2.patch

This patch was dropped because it was folded into x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs.patch

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
From: Daniel Drake <dsd@laptop.org>
Subject: x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs-v2

v2: Fix sscanf usage error and add an explanatory comment in the code, both pointed out by Andrew Morton. Thanks!

Signed-off-by: Daniel Drake <dsd@laptop.org>
Cc: Andres Salomon <dilinger@queued.net>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/x86/platform/olpc/olpc-xo15-sci.c |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff -puN arch/x86/platform/olpc/olpc-xo15-sci.c~x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs-v2 arch/x86/platform/olpc/olpc-xo15-sci.c
--- a/arch/x86/platform/olpc/olpc-xo15-sci.c~x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs-v2
+++ a/arch/x86/platform/olpc/olpc-xo15-sci.c
@@ -26,6 +26,17 @@
 static unsigned long xo15_sci_gpe;
 static bool lid_wake_on_close;
 
+/*
+ * The normal ACPI LID wakeup behavior is wake-on-open, but not
+ * wake-on-close. This is implemented as standard by the XO-1.5 DSDT.
+ *
+ * We provide here a sysfs attribute that will additionally enable
+ * wake-on-close behavior. This is useful (e.g.) when we oportunistically
+ * suspend with the display running; if the lid is then closed, we want to
+ * wake up to turn the display off.
+ *
+ * This is controlled through a custom method in the XO-1.5 DSDT.
+ */
 static int set_lid_wake_behavior(bool wake_on_close)
 {
 	struct acpi_object_list arg_list;
@@ -39,7 +50,7 @@ static int set_lid_wake_behavior(bool wa
 	status = acpi_evaluate_object(NULL, "\\_SB.PCI0.LID.LIDW", &arg_list,
 				      NULL);
 	if (ACPI_FAILURE(status)) {
-		pr_warning(PFX "failed to set lid behaviour\n");
+		pr_warning(PFX "failed to set lid behavior\n");
 		return 1;
 	}
 
_

Patches currently in -mm which might be from dsd@laptop.org are

origin.patch
linux-next.patch
x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs.patch
x86-olpc-add-debugfs-interface-for-ec-commands.patch