X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-v850%2Fprocessor.h;h=2d31308935a00ab0263feab4b75ce8be482724be;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=979e3467f9afc14b2a9e1db9eb33ec400c693371;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/include/asm-v850/processor.h b/include/asm-v850/processor.h
index 979e3467f..2d3130893 100644
--- a/include/asm-v850/processor.h
+++ b/include/asm-v850/processor.h
@@ -14,11 +14,11 @@
 #ifndef __V850_PROCESSOR_H__
 #define __V850_PROCESSOR_H__
 
+#include <linux/config.h>
 #ifndef __ASSEMBLY__ /* <linux/thread_info.h> is not asm-safe.  */
 #include <linux/thread_info.h>
 #endif
 
-#include <linux/compiler.h>
 #include <asm/ptrace.h>
 #include <asm/entry.h>
 
@@ -107,7 +107,7 @@ unsigned long get_wchan (struct task_struct *p);
 #define KSTK_ESP(task)	task_sp (task)
 
 
-#define cpu_relax()    barrier()
+#define cpu_relax()    ((void)0)
 
 
 #else /* __ASSEMBLY__ */