openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge master.kernel.org:/home/rmk/linux-2.6-serial 

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] typo: buad -> baud
This commit is contained in:
Linus Torvalds 2006-06-05 16:23:02 -07:00
parent 2f9c3c2c24 e853534e6b
commit a8c725045e
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/ddb5xxx/ddb5476/dbg_io.c
View File

@ -86,7 +86,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
/* disable interrupts */ /* disable interrupts */
UART16550_WRITE(OFS_INTR_ENABLE, 0); UART16550_WRITE(OFS_INTR_ENABLE, 0);
/* set up buad rate */ /* set up baud rate */
{ {
uint32 divisor; uint32 divisor;

2
arch/mips/ddb5xxx/ddb5477/kgdb_io.c
View File

@ -86,7 +86,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
/* disable interrupts */ /* disable interrupts */
UART16550_WRITE(OFS_INTR_ENABLE, 0); UART16550_WRITE(OFS_INTR_ENABLE, 0);
/* set up buad rate */ /* set up baud rate */
{ {
uint32 divisor; uint32 divisor;

2
arch/mips/gt64120/ev64120/serialGT.c
View File

@ -149,7 +149,7 @@ void serial_set(int channel, unsigned long baud)
#else #else
/* /*
* Note: Set baud rate, hardcoded here for rate of 115200 * Note: Set baud rate, hardcoded here for rate of 115200
* since became unsure of above "buad rate" algorithm (??). * since became unsure of above "baud rate" algorithm (??).
*/ */
outreg(channel, LCR, 0x83); outreg(channel, LCR, 0x83);
outreg(channel, DLM, 0x00); // See note above outreg(channel, DLM, 0x00); // See note above

2
arch/mips/gt64120/momenco_ocelot/dbg_io.c
View File

@ -73,7 +73,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
/* disable interrupts */ /* disable interrupts */
UART16550_WRITE(OFS_INTR_ENABLE, 0); UART16550_WRITE(OFS_INTR_ENABLE, 0);
/* set up buad rate */ /* set up baud rate */
{ {
uint32 divisor; uint32 divisor;

2
arch/mips/ite-boards/generic/dbg_io.c
View File

@ -72,7 +72,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
/* disable interrupts */ /* disable interrupts */
UART16550_WRITE(OFS_INTR_ENABLE, 0); UART16550_WRITE(OFS_INTR_ENABLE, 0);
/* set up buad rate */ /* set up baud rate */
{ {
uint32 divisor; uint32 divisor;

2
arch/mips/momentum/jaguar_atx/dbg_io.c
View File

@ -73,7 +73,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
/* disable interrupts */ /* disable interrupts */
UART16550_WRITE(OFS_INTR_ENABLE, 0); UART16550_WRITE(OFS_INTR_ENABLE, 0);
/* set up buad rate */ /* set up baud rate */
{ {
uint32 divisor; uint32 divisor;

2
arch/mips/momentum/ocelot_c/dbg_io.c
View File

@ -73,7 +73,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
/* disable interrupts */ /* disable interrupts */
UART16550_WRITE(OFS_INTR_ENABLE, 0); UART16550_WRITE(OFS_INTR_ENABLE, 0);
/* set up buad rate */ /* set up baud rate */
{ {
uint32 divisor; uint32 divisor;

2
arch/mips/momentum/ocelot_g/dbg_io.c
View File

@ -73,7 +73,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
/* disable interrupts */ /* disable interrupts */
UART16550_WRITE(OFS_INTR_ENABLE, 0); UART16550_WRITE(OFS_INTR_ENABLE, 0);
/* set up buad rate */ /* set up baud rate */
{ {
uint32 divisor; uint32 divisor;

2
include/asm-arm/arch-l7200/serial_l7200.h
View File

@ -28,7 +28,7 @@
#define UARTDR 0x00 /* Tx/Rx data */ #define UARTDR 0x00 /* Tx/Rx data */
#define RXSTAT 0x04 /* Rx status */ #define RXSTAT 0x04 /* Rx status */
#define H_UBRLCR 0x08 /* mode register high */ #define H_UBRLCR 0x08 /* mode register high */
#define M_UBRLCR 0x0C /* mode reg mid (MSB of buad)*/ #define M_UBRLCR 0x0C /* mode reg mid (MSB of baud)*/
#define L_UBRLCR 0x10 /* mode reg low (LSB of baud)*/ #define L_UBRLCR 0x10 /* mode reg low (LSB of baud)*/
#define UARTCON 0x14 /* control register */ #define UARTCON 0x14 /* control register */
#define UARTFLG 0x18 /* flag register */ #define UARTFLG 0x18 /* flag register */

2
include/asm-arm/arch-l7200/uncompress.h
View File

@ -6,7 +6,7 @@
* Changelog: * Changelog:
* 05-01-2000 SJH Created * 05-01-2000 SJH Created
* 05-13-2000 SJH Filled in function bodies * 05-13-2000 SJH Filled in function bodies
* 07-26-2000 SJH Removed hard coded buad rate * 07-26-2000 SJH Removed hard coded baud rate
*/ */
#include <asm/hardware.h> #include <asm/hardware.h>