From ea62aa1b6f6d31b53a34a6f5271ed85735ccc0bc Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Mon, 9 Oct 2006 22:27:42 +0200
Subject: [PATCH] [PATCH] m68k/MVME167: SERIAL167 is no longer broken
- SERIAL167 is no longer broken
- Removed some unused variables from the driver to fix compiler warnings
Signed-off-by: Kars de Jong <jongk@linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---
arch/m68k/Kconfig | 2 +-
drivers/char/serial167.c | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 805b81fedf80a..7bc14461a6ac5 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -600,7 +600,7 @@ config MVME147_SCC
config SERIAL167
bool "CD2401 support for MVME166/7 serial ports"
- depends on MVME16x && BROKEN
+ depends on MVME16x
help
This is the driver for the serial ports on the Motorola MVME166,
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 6f13f98e31712..defc0dbdedb3b 100644
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -1422,7 +1422,6 @@ cy_tiocmget(struct tty_struct *tty, struct file *file)
volatile unsigned char *base_addr = (u_char *)BASE_ADDR;
unsigned long flags;
unsigned char status;
- unsigned int result;
channel = info->line;
@@ -1446,7 +1445,6 @@ cy_tiocmset(struct tty_struct *tty, struct file *file,
int channel;
volatile unsigned char *base_addr = (u_char *)BASE_ADDR;
unsigned long flags;
- unsigned int arg;
channel = info->line;
--
2.30.2