From 400068037ff7913902fb9ec74593990dfba156ae Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Tue, 20 Jul 2010 15:26:54 -0700 Subject: [PATCH] --- yaml --- r: 207930 b: refs/heads/master c: f5e92c3f9ca148181f1baaec8db271845b2420f0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/68328serial.c | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index de335c45eb88..2941215473d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1a6f24394d44b7bd2c8ec3f301a5eda72ce462f +refs/heads/master: f5e92c3f9ca148181f1baaec8db271845b2420f0 diff --git a/trunk/drivers/serial/68328serial.c b/trunk/drivers/serial/68328serial.c index d8204f4ebbb4..7356a56ac458 100644 --- a/trunk/drivers/serial/68328serial.c +++ b/trunk/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