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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
[pandora-kernel.git]
/
arch
/
parisc
/
kernel
/
parisc_ksyms.c
diff --git
a/arch/parisc/kernel/parisc_ksyms.c
b/arch/parisc/kernel/parisc_ksyms.c
index
df65366
..
a7bb757
100644
(file)
--- a/
arch/parisc/kernel/parisc_ksyms.c
+++ b/
arch/parisc/kernel/parisc_ksyms.c
@@
-31,7
+31,7
@@
#include <linux/string.h>
EXPORT_SYMBOL(memset);
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
EXPORT_SYMBOL(__xchg8);
EXPORT_SYMBOL(__xchg32);
EXPORT_SYMBOL(__cmpxchg_u32);