---

yaml --- r: 298535 b: refs/heads/master c: 167d821 h: refs/heads/master i: 298533: c98999c 298531: 8c0344d 298527: 1b8de4a v: v3
git-mirror · Apr 4, 2012 · 258820c · 258820c
1 parent ff9a020
commit 258820c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3718a818f7fb3636130d5f34bde8df34f45c5e5
+refs/heads/master: 167d82152079debd0a76726972a76ea032d82043
diff --git a/trunk/arch/avr32/include/asm/barrier.h b/trunk/arch/avr32/include/asm/barrier.h
@@ -8,6 +8,8 @@
 #ifndef __ASM_AVR32_BARRIER_H
 #define __ASM_AVR32_BARRIER_H
 
+#define nop()			asm volatile("nop")
+
 #define mb()			asm volatile("" : : : "memory")
 #define rmb()			mb()
 #define wmb()			asm volatile("sync 0" : : : "memory")

diff --git a/trunk/arch/avr32/include/asm/special_insns.h b/trunk/arch/avr32/include/asm/special_insns.h