H8/300 inline cleanup

diff -Nru a/include/asm-h8300/delay.h b/include/asm-h8300/delay.h
@@ -11,11 +11,10 @@
 
 extern __inline__ void __delay(unsigned long loops)
 {
-	__asm__ __volatile__ ("mov.l %0,er0\n\t"
-			      "1:\n\t"
-			      "dec.l #1,er0\n\t"
+	__asm__ __volatile__ ("1:\n\t"
+			      "dec.l #1,%0\n\t"
 			      "bne 1b"
-			      ::"r" (loops):"er0");
+			      :"=r" (loops):"0"(loops));
 }
 
 /*

diff -Nru 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 @@
     __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__