Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

[linux-2.6-omap-h63xx.git] / include / asm-i386 / atomic.h

diff --git a/include/asm-i386/atomic.h b/include/asm-i386/atomic.h
index 6aab7a105fad1e34bb7f92a65170ba3c1d02b91d..c57441bb290502c449e4217684711a3b11c34a3f 100644 (file)
--- a/include/asm-i386/atomic.h
+++ b/include/asm-i386/atomic.h
@@ -14,7 +14,7 @@
  * on us. We need to use _exactly_ the address the user gave us,
  * not some alias that contains the same information.
  */
-typedef struct { volatile int counter; } atomic_t;
+typedef struct { int counter; } atomic_t;
 
 #define ATOMIC_INIT(i) { (i) }