vserver 1.9.5.x5

[linux-2.6.git] / include / asm-h8300 / system.h

diff --git a/include/asm-h8300/system.h b/include/asm-h8300/system.h
index 2a29101..b91dae2 100644 (file)
--- a/include/asm-h8300/system.h
+++ b/include/asm-h8300/system.h
@@ -2,7 +2,6 @@
 #define _H8300_SYSTEM_H
 
 #include <linux/config.h> /* get configuration macros */
-#include <linux/kernel.h>
 #include <linux/linkage.h>
 
 #define prepare_to_switch()    do { } while(0)
@@ -119,7 +118,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
     __asm__ __volatile__
     ("mov.b %2,%0\n\t"
      "mov.b %1,%2"
-    : "=&r" (tmp) : "r" (x), "m" (*__xg(ptr)) : "er0","memory");
+    : "=&r" (tmp) : "r" (x), "m" (*__xg(ptr)) : "memory");
     break;
   case 2:
     __asm__ __volatile__