Merge branch 'linus' into x86/microcode, to pick up merge window changes

[cascardo/linux.git] / arch / frv / include / asm / serial.h

diff --git a/arch/frv/include/asm/serial.h b/arch/frv/include/asm/serial.h
index bce0d0d..614c6d7 100644 (file)
--- a/arch/frv/include/asm/serial.h
+++ b/arch/frv/include/asm/serial.h
@@ -12,7 +12,3 @@
  * the base baud is derived from the clock speed and so is variable
  */
 #define BASE_BAUD 0
-
-#define STD_COM_FLAGS          UPF_BOOT_AUTOCONF
-
-#define SERIAL_PORT_DFNS