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/geert/linux...
[pandora-kernel.git]
/
arch
/
alpha
/
include
/
asm
/
local.h
diff --git
a/arch/alpha/include/asm/local.h
b/arch/alpha/include/asm/local.h
index
b9e3e33
..
9c94b84
100644
(file)
--- a/
arch/alpha/include/asm/local.h
+++ b/
arch/alpha/include/asm/local.h
@@
-2,7
+2,7
@@
#define _ALPHA_LOCAL_H
#include <linux/percpu.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
typedef struct
{