Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de6cc84f authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[SERIAL] Remove m32r_sio dependency on asm/serial.h 



m32r_sio re-uses a custom defined BASE_BAUD from asm/serial.h,
and replaces SERIAL_PORT_DFNS with its own driver private copy.
Since asm/serial.h is supposed to define 8250-based ports using
these symbols, this isn't a sane idea.

Hence, eliminate asm/serial.h from m32r_sio.c.

Acked-by: default avatarHirokazu Takata <takata@linux-m32r.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent bf603625

drivers/serial/m32r_sio.c

+2 −3
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
 */

#define is_real_interrupt(irq)	((irq) != 0)



#include <asm/serial.h>

#define BASE_BAUD	115200



/* Standard COM flags */

#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST)
@@ -86,7 +86,6 @@ 
 * standard enumeration mechanism.   Platforms that can find all

 * serial ports via mechanisms like ACPI or PCI need not supply it.

 */

#undef SERIAL_PORT_DFNS

#if defined(CONFIG_PLAT_USRV)



#define SERIAL_PORT_DFNS						\
@@ -109,7 +108,7 @@ 
#endif /* !CONFIG_PLAT_USRV */



static struct old_serial_port old_serial_port[] = {

	SERIAL_PORT_DFNS	/* defined in asm/serial.h */

	SERIAL_PORT_DFNS

};



#define UART_NR	ARRAY_SIZE(old_serial_port)