diff --git a/[refs] b/[refs]
index 61b7d8349d45..5d5386564601 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8d01a6378db6e3eeb8777a8769c69e455635dc3
+refs/heads/master: 07d5b38e14b7ff98eb52e4a6db4e20abcc608da3
diff --git a/trunk/arch/x86/platform/olpc/olpc-xo15-sci.c b/trunk/arch/x86/platform/olpc/olpc-xo15-sci.c
index a5990ebadbe4..2b235b77d9ab 100644
--- a/trunk/arch/x86/platform/olpc/olpc-xo15-sci.c
+++ b/trunk/arch/x86/platform/olpc/olpc-xo15-sci.c
@@ -120,7 +120,7 @@ static int xo15_sci_add(struct acpi_device *device)
 
 	/* Enable wake-on-EC */
 	if (device->wakeup.flags.valid)
-		device_set_wakeup_enable(&device->dev, true);
+		device_init_wakeup(&device->dev, true);
 
 	return 0;
 }