Skip to content

Commit

Permalink
[SERIAL] Remove m32r_sio dependency on asm/serial.h
Browse files Browse the repository at this point in the history
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: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King authored and Russell King committed Oct 1, 2006
1 parent bf60362 commit de6cc84
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/serial/m32r_sio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 \
Expand All @@ -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)
Expand Down

0 comments on commit de6cc84

Please sign in to comment.