git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc
[pandora-kernel.git]
/
drivers
/
platform
/
x86
/
xo1-rfkill.c
diff --git
a/drivers/platform/x86/xo1-rfkill.c
b/drivers/platform/x86/xo1-rfkill.c
index
b57ad86
..
1da13ed
100644
(file)
--- a/
drivers/platform/x86/xo1-rfkill.c
+++ b/
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;