Merge branches 'release', 'ejd', 'sony' and 'wmi' into release

[karo-tx-linux.git] / include / asm-sh / types.h

diff --git a/include/asm-sh/types.h b/include/asm-sh/types.h
index 7ba69d9707eff7eecc876b345469ee81a8461866..a6e1d4126e6756fdc0dbf78f345637bc42eb3b72 100644 (file)
--- a/include/asm-sh/types.h
+++ b/include/asm-sh/types.h
@@ -52,6 +52,12 @@ typedef unsigned long long u64;
 
 typedef u32 dma_addr_t;
 
+#ifdef CONFIG_SUPERH32
+typedef u16 opcode_t;
+#else
+typedef u32 opcode_t;
+#endif
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */