From aa5cd44ce2f5b01281d41bc34407d47735db9c6b Mon Sep 17 00:00:00 2001
From: Andres Salomon <dilinger@queued.net>
Date: Wed, 11 Jul 2012 01:16:29 -0700
Subject: [PATCH] --- yaml --- r: 321283 b: refs/heads/master c:
 3bf9428f220911795edde453a95f9509945004e5 h: refs/heads/master i:   321281:
 08f1f31b0ef707bf4880fda41d874c2e604d7bf2   321279:
 b0bd9101491a2a3866dc689450183afa9bff27a2 v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/x86/include/asm/olpc.h            | 1 -
 trunk/arch/x86/platform/olpc/olpc-xo1-pm.c   | 1 +
 trunk/arch/x86/platform/olpc/olpc-xo1-sci.c  | 1 +
 trunk/arch/x86/platform/olpc/olpc-xo15-sci.c | 1 +
 trunk/arch/x86/platform/olpc/olpc.c          | 1 +
 trunk/drivers/net/wireless/libertas/if_usb.c | 1 +
 trunk/drivers/platform/x86/xo1-rfkill.c      | 3 +--
 trunk/drivers/power/olpc_battery.c           | 1 +
 trunk/drivers/staging/olpc_dcon/olpc_dcon.c  | 1 +
 10 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8ea50cb2cc98..6ca35ae3dd5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 392a325c4351339cfbf182bb5a1444df1cf65dbb
+refs/heads/master: 3bf9428f220911795edde453a95f9509945004e5
diff --git a/trunk/arch/x86/include/asm/olpc.h b/trunk/arch/x86/include/asm/olpc.h
index 513e9992771d..5b28f3e69758 100644
--- a/trunk/arch/x86/include/asm/olpc.h
+++ b/trunk/arch/x86/include/asm/olpc.h
@@ -4,7 +4,6 @@
 #define _ASM_X86_OLPC_H
 
 #include <asm/geode.h>
-#include <linux/olpc-ec.h>
 
 struct olpc_platform_t {
 	int flags;
diff --git a/trunk/arch/x86/platform/olpc/olpc-xo1-pm.c b/trunk/arch/x86/platform/olpc/olpc-xo1-pm.c
index 0ce8616c88ae..8054b64ec4ce 100644
--- a/trunk/arch/x86/platform/olpc/olpc-xo1-pm.c
+++ b/trunk/arch/x86/platform/olpc/olpc-xo1-pm.c
@@ -18,6 +18,7 @@
 #include <linux/pm.h>
 #include <linux/mfd/core.h>
 #include <linux/suspend.h>
+#include <linux/olpc-ec.h>
 
 #include <asm/io.h>
 #include <asm/olpc.h>
diff --git a/trunk/arch/x86/platform/olpc/olpc-xo1-sci.c b/trunk/arch/x86/platform/olpc/olpc-xo1-sci.c
index 04b8c73659c5..63d4aa40956e 100644
--- a/trunk/arch/x86/platform/olpc/olpc-xo1-sci.c
+++ b/trunk/arch/x86/platform/olpc/olpc-xo1-sci.c
@@ -23,6 +23,7 @@
 #include <linux/power_supply.h>
 #include <linux/suspend.h>
 #include <linux/workqueue.h>
+#include <linux/olpc-ec.h>
 
 #include <asm/io.h>
 #include <asm/msr.h>
diff --git a/trunk/arch/x86/platform/olpc/olpc-xo15-sci.c b/trunk/arch/x86/platform/olpc/olpc-xo15-sci.c
index 599be499fdf7..2fdca25905ae 100644
--- a/trunk/arch/x86/platform/olpc/olpc-xo15-sci.c
+++ b/trunk/arch/x86/platform/olpc/olpc-xo15-sci.c
@@ -13,6 +13,7 @@
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/power_supply.h>
+#include <linux/olpc-ec.h>
 
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
diff --git a/trunk/arch/x86/platform/olpc/olpc.c b/trunk/arch/x86/platform/olpc/olpc.c
index 796e199ac77a..a3fa180c15c8 100644
--- a/trunk/arch/x86/platform/olpc/olpc.c
+++ b/trunk/arch/x86/platform/olpc/olpc.c
@@ -22,6 +22,7 @@
 #include <linux/syscore_ops.h>
 #include <linux/debugfs.h>
 #include <linux/mutex.h>
+#include <linux/olpc-ec.h>
 
 #include <asm/geode.h>
 #include <asm/setup.h>
diff --git a/trunk/drivers/net/wireless/libertas/if_usb.c b/trunk/drivers/net/wireless/libertas/if_usb.c
index 55a77e41170a..27980778d992 100644
--- a/trunk/drivers/net/wireless/libertas/if_usb.c
+++ b/trunk/drivers/net/wireless/libertas/if_usb.c
@@ -10,6 +10,7 @@
 #include <linux/netdevice.h>
 #include <linux/slab.h>
 #include <linux/usb.h>
+#include <linux/olpc-ec.h>
 
 #ifdef CONFIG_OLPC
 #include <asm/olpc.h>
diff --git a/trunk/drivers/platform/x86/xo1-rfkill.c b/trunk/drivers/platform/x86/xo1-rfkill.c
index b57ad8641480..1da13ed34b04 100644
--- a/trunk/drivers/platform/x86/xo1-rfkill.c
+++ b/trunk/drivers/platform/x86/xo1-rfkill.c
@@ -12,8 +12,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/rfkill.h>
-
-#include <asm/olpc.h>
+#include <linux/olpc-ec.h>
 
 static bool card_blocked;
 
diff --git a/trunk/drivers/power/olpc_battery.c b/trunk/drivers/power/olpc_battery.c
index 7385092f9bc8..eaf917dc30d4 100644
--- a/trunk/drivers/power/olpc_battery.c
+++ b/trunk/drivers/power/olpc_battery.c
@@ -17,6 +17,7 @@
 #include <linux/power_supply.h>
 #include <linux/jiffies.h>
 #include <linux/sched.h>
+#include <linux/olpc-ec.h>
 #include <asm/olpc.h>
 
 
diff --git a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c
index 992275c0d87c..2c4bd746715a 100644
--- a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -27,6 +27,7 @@
 #include <linux/uaccess.h>
 #include <linux/ctype.h>
 #include <linux/reboot.h>
+#include <linux/olpc-ec.h>
 #include <asm/tsc.h>
 #include <asm/olpc.h>