Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 207930
b: refs/heads/master
c: f5e92c3
h: refs/heads/master
v: v3
  • Loading branch information
Christoph Egger authored and Greg Kroah-Hartman committed Aug 10, 2010
1 parent 93db4a0 commit 4000680
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b1a6f24394d44b7bd2c8ec3f301a5eda72ce462f
refs/heads/master: f5e92c3f9ca148181f1baaec8db271845b2420f0
16 changes: 5 additions & 11 deletions trunk/drivers/serial/68328serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4000680

Please sign in to comment.