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/dtor/input
[pandora-kernel.git]
/
include
/
linux
/
types.h
diff --git
a/include/linux/types.h
b/include/linux/types.h
index
c42724f
..
23d237a
100644
(file)
--- a/
include/linux/types.h
+++ b/
include/linux/types.h
@@
-188,12
+188,12
@@
typedef u32 phys_addr_t;
typedef phys_addr_t resource_size_t;
typedef struct {
-
volatile
int counter;
+ int counter;
} atomic_t;
#ifdef CONFIG_64BIT
typedef struct {
-
volatile
long counter;
+ long counter;
} atomic64_t;
#endif