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 'next-i2c' of git://git.fluff.org/bjdooks/linux
[pandora-kernel.git]
/
include
/
linux
/
key.h
diff --git
a/include/linux/key.h
b/include/linux/key.h
index
6ea4eeb
..
183a6af
100644
(file)
--- a/
include/linux/key.h
+++ b/
include/linux/key.h
@@
-21,7
+21,7
@@
#include <linux/rcupdate.h>
#include <linux/sysctl.h>
#include <linux/rwsem.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#ifdef __KERNEL__