summaryrefslogtreecommitdiffstats
path: root/include/asm-m32r/atomic.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-01-17 12:01:12 +0100
committerTakashi Iwai <tiwai@suse.de>2009-01-17 12:01:12 +0100
commitd1a020050c6ce1a0794ff73582ccf47e4db536f7 (patch)
tree1b7250410f24703cd77c76156e758db9887137aa /include/asm-m32r/atomic.h
parentALSA: rename "Device" to "Toshiba SB-0500" via quirks (diff)
parentALSA: usb-audio - Cache mixer values (diff)
downloadlinux-d1a020050c6ce1a0794ff73582ccf47e4db536f7.tar.xz
linux-d1a020050c6ce1a0794ff73582ccf47e4db536f7.zip
Merge branch 'topic/usb-mixer-cache' into next/usb-audio
Diffstat (limited to 'include/asm-m32r/atomic.h')
-rw-r--r--include/asm-m32r/atomic.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/include/asm-m32r/atomic.h b/include/asm-m32r/atomic.h
index 3a38ffe4a4f4..2eed30f84080 100644
--- a/include/asm-m32r/atomic.h
+++ b/include/asm-m32r/atomic.h
@@ -9,6 +9,7 @@
* Copyright (C) 2004 Hirokazu Takata <takata at linux-m32r.org>
*/
+#include <linux/types.h>
#include <asm/assembler.h>
#include <asm/system.h>
@@ -17,13 +18,6 @@
* resource counting etc..
*/
-/*
- * Make sure gcc doesn't try to be clever and move things around
- * 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;
-
#define ATOMIC_INIT(i) { (i) }
/**