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 git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils
[pandora-kernel.git]
/
arch
/
alpha
/
lib
/
dec_and_lock.c
diff --git
a/arch/alpha/lib/dec_and_lock.c
b/arch/alpha/lib/dec_and_lock.c
index
0f5520d
..
f9f5fe8
100644
(file)
--- a/
arch/alpha/lib/dec_and_lock.c
+++ b/
arch/alpha/lib/dec_and_lock.c
@@
-6,7
+6,7
@@
*/
#include <linux/spinlock.h>
*/
#include <linux/spinlock.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
asm (".text \n\
.global _atomic_dec_and_lock \n\
asm (".text \n\
.global _atomic_dec_and_lock \n\