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

Commit 0b35ff23 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 92dd7ca0 026d02a2

Documentation/serial/driver

+2 −2
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ hardware. 
	indicate that the signal is permanently active.  If RI is

	not available, the signal should not be indicated as active.



	Locking: none.

	Interrupts: caller dependent.

	Locking: port->lock taken.

	Interrupts: locally disabled.

	This call must not sleep



  stop_tx(port,tty_stop)

arch/parisc/configs/712_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ CONFIG_HW_CONSOLE=y 
#

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=8

CONFIG_SERIAL_8250_NR_UARTS=17

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

arch/parisc/configs/a500_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ CONFIG_HW_CONSOLE=y 
CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_CS=m

CONFIG_SERIAL_8250_NR_UARTS=8

CONFIG_SERIAL_8250_NR_UARTS=17

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

arch/parisc/configs/b180_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ CONFIG_HW_CONSOLE=y 
#

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=4

CONFIG_SERIAL_8250_NR_UARTS=13

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

arch/parisc/configs/c3000_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ CONFIG_HW_CONSOLE=y 
#

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=4

CONFIG_SERIAL_8250_NR_UARTS=13

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_SHARE_IRQ=y