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' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
prom.h
diff --git
a/arch/x86/include/asm/prom.h
b/arch/x86/include/asm/prom.h
index
df12870
..
644dd88
100644
(file)
--- a/
arch/x86/include/asm/prom.h
+++ b/
arch/x86/include/asm/prom.h
@@
-19,7
+19,7
@@
#include <linux/pci.h>
#include <asm/irq.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/setup.h>
#include <asm/irq_controller.h>