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]
/
arch
/
blackfin
/
include
/
asm
/
spinlock.h
diff --git
a/arch/blackfin/include/asm/spinlock.h
b/arch/blackfin/include/asm/spinlock.h
index
1f286e7
..
490c7ca
100644
(file)
--- a/
arch/blackfin/include/asm/spinlock.h
+++ b/
arch/blackfin/include/asm/spinlock.h
@@
-1,8
+1,8
@@
/*
/*
-
* Copyright 2004-2009 Analog Devices Inc.
-
*
-
* Licensed under the GPL-2 or later.
-
*/
+
* Copyright 2004-2009 Analog Devices Inc.
+
*
+
* Licensed under the GPL-2 or later.
+
*/
#ifndef __BFIN_SPINLOCK_H
#define __BFIN_SPINLOCK_H
#ifndef __BFIN_SPINLOCK_H
#define __BFIN_SPINLOCK_H
@@
-11,7
+11,7
@@
# include <asm-generic/spinlock.h>
#else
# include <asm-generic/spinlock.h>
#else
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
asmlinkage int __raw_spin_is_locked_asm(volatile int *ptr);
asmlinkage void __raw_spin_lock_asm(volatile int *ptr);
asmlinkage int __raw_spin_is_locked_asm(volatile int *ptr);
asmlinkage void __raw_spin_lock_asm(volatile int *ptr);