Revert h8300

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index a26653f..2be9da6 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -747,7 +747,7 @@ config SERIAL_IP22_ZILOG_CONSOLE
 
 config SERIAL_SH_SCI
        tristate "SuperH SCI(F) serial port support"
-       depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
+       depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST || H8300
        select SERIAL_CORE
 
 config SERIAL_SH_SCI_NR_UARTS

diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h
index ae99f77..b088296 100644 (file)
--- a/include/uapi/linux/elf-em.h
+++ b/include/uapi/linux/elf-em.h
@@ -25,6 +25,7 @@
 #define EM_ARM         40      /* ARM 32 bit */
 #define EM_SH          42      /* SuperH */
 #define EM_SPARCV9     43      /* SPARC v9 64-bit */
+#define EM_H8_300      46      /* Renesas H8/300 */
 #define EM_IA_64       50      /* HP/Intel IA-64 */
 #define EM_X86_64      62      /* AMD x86-64 */
 #define EM_S390                22      /* IBM S/390 */