summaryrefslogtreecommitdiff
path: root/drivers/serial
diff options
context:
space:
mode:
authorChristoph Egger <siccegge@cs.fau.de>2010-07-20 15:26:54 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-10 13:47:45 -0700
commitf5e92c3f9ca148181f1baaec8db271845b2420f0 (patch)
treec25222b5fe6581d1161a3aa51a4cc543b99c3780 /drivers/serial
parentb1a6f24394d44b7bd2c8ec3f301a5eda72ce462f (diff)
serial: 68328serial.c: remove dead (ALMA_ANS | DRAGONIXVZ | M68EZ328ADS)
(ALMA_ANS | DRAGONIXVZ | M68EZ328ADS) doesn't exist in Kconfig, therefore remove all references to it from the source code. Signed-off-by: Christoph Egger <siccegge@cs.fau.de> Acked-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/68328serial.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c
index d8204f4ebbb4..7356a56ac458 100644
--- a/drivers/serial/68328serial.c
+++ b/drivers/serial/68328serial.c
@@ -98,19 +98,13 @@ static void change_speed(struct m68k_serial *info);
* Setup for console. Argument comes from the boot command line.
*/
-#if defined(CONFIG_M68EZ328ADS) || defined(CONFIG_ALMA_ANS) || defined(CONFIG_DRAGONIXVZ)
-#define CONSOLE_BAUD_RATE 115200
-#define DEFAULT_CBAUD B115200
-#else
- /* (es) */
- /* note: this is messy, but it works, again, perhaps defined somewhere else?*/
- #ifdef CONFIG_M68VZ328
- #define CONSOLE_BAUD_RATE 19200
- #define DEFAULT_CBAUD B19200
- #endif
- /* (/es) */
+/* note: this is messy, but it works, again, perhaps defined somewhere else?*/
+#ifdef CONFIG_M68VZ328
+#define CONSOLE_BAUD_RATE 19200
+#define DEFAULT_CBAUD B19200
#endif
+
#ifndef CONSOLE_BAUD_RATE
#define CONSOLE_BAUD_RATE 9600
#define DEFAULT_CBAUD B9600