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/davem/net-next-2.6
[pandora-kernel.git]
/
arch
/
blackfin
/
include
/
asm
/
bitops.h
diff --git
a/arch/blackfin/include/asm/bitops.h
b/arch/blackfin/include/asm/bitops.h
index
21b036e
..
75fee2f
100644
(file)
--- a/
arch/blackfin/include/asm/bitops.h
+++ b/
arch/blackfin/include/asm/bitops.h
@@
-109,7
+109,8
@@
static inline void clear_bit(int nr, volatile unsigned long *addr)
static inline void change_bit(int nr, volatile unsigned long *addr)
{
static inline void change_bit(int nr, volatile unsigned long *addr)
{
- int mask, flags;
+ int mask;
+ unsigned long flags;
unsigned long *ADDR = (unsigned long *)addr;
ADDR += nr >> 5;
unsigned long *ADDR = (unsigned long *)addr;
ADDR += nr >> 5;