aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/m68k/Kconfig2
-rw-r--r--drivers/char/serial167.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 805b81fedf80..7bc14461a6ac 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -600,7 +600,7 @@ config MVME147_SCC
600 600
601config SERIAL167 601config SERIAL167
602 bool "CD2401 support for MVME166/7 serial ports" 602 bool "CD2401 support for MVME166/7 serial ports"
603 depends on MVME16x && BROKEN 603 depends on MVME16x
604 help 604 help
605 This is the driver for the serial ports on the Motorola MVME166, 605 This is the driver for the serial ports on the Motorola MVME166,
606 167, and 172 boards. Everyone using one of these boards should say 606 167, and 172 boards. Everyone using one of these boards should say
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index 6f13f98e3171..defc0dbdedb3 100644
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -1422,7 +1422,6 @@ cy_tiocmget(struct tty_struct *tty, struct file *file)
1422 volatile unsigned char *base_addr = (u_char *)BASE_ADDR; 1422 volatile unsigned char *base_addr = (u_char *)BASE_ADDR;
1423 unsigned long flags; 1423 unsigned long flags;
1424 unsigned char status; 1424 unsigned char status;
1425 unsigned int result;
1426 1425
1427 channel = info->line; 1426 channel = info->line;
1428 1427
@@ -1446,7 +1445,6 @@ cy_tiocmset(struct tty_struct *tty, struct file *file,
1446 int channel; 1445 int channel;
1447 volatile unsigned char *base_addr = (u_char *)BASE_ADDR; 1446 volatile unsigned char *base_addr = (u_char *)BASE_ADDR;
1448 unsigned long flags; 1447 unsigned long flags;
1449 unsigned int arg;
1450 1448
1451 channel = info->line; 1449 channel = info->line;
1452 1450