Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8c72504 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] typo: buad -> baud
parents 2f9c3c2c e853534e

arch/mips/ddb5xxx/ddb5476/dbg_io.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop) 
        /* disable interrupts */

        UART16550_WRITE(OFS_INTR_ENABLE, 0);



        /* set up buad rate */

        /* set up baud rate */

        {

                uint32 divisor;

arch/mips/ddb5xxx/ddb5477/kgdb_io.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop) 
        /* disable interrupts */

        UART16550_WRITE(OFS_INTR_ENABLE, 0);



        /* set up buad rate */

        /* set up baud rate */

        {

                uint32 divisor;

arch/mips/gt64120/ev64120/serialGT.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ void serial_set(int channel, unsigned long baud) 
#else

	/*

	 * 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, DLM, 0x00);	// See note above

arch/mips/gt64120/momenco_ocelot/dbg_io.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop) 
	/* disable interrupts */

	UART16550_WRITE(OFS_INTR_ENABLE, 0);



	/* set up buad rate */

	/* set up baud rate */

	{

		uint32 divisor;

arch/mips/ite-boards/generic/dbg_io.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop) 
	/* disable interrupts */

	UART16550_WRITE(OFS_INTR_ENABLE, 0);



	/* set up buad rate */

	/* set up baud rate */

	{

		uint32 divisor;