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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  tty: Mark generic_serial users as BROKEN
parents a9fd74cb 41214594

arch/m68k/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ config HPAPCI 


config MVME147_SCC

	bool "SCC support for MVME147 serial ports"

	depends on MVME147

	depends on MVME147 && BROKEN

	help

	  This is the driver for the serial ports on the Motorola MVME147

	  boards.  Everyone using one of these boards should say Y here.
@@ -576,14 +576,14 @@ config SERIAL167 


config MVME162_SCC

	bool "SCC support for MVME162 serial ports"

	depends on MVME16x

	depends on MVME16x && BROKEN

	help

	  This is the driver for the serial ports on the Motorola MVME162 and

	  172 boards.  Everyone using one of these boards should say Y here.



config BVME6000_SCC

	bool "SCC support for BVME6000 serial ports"

	depends on BVME6000

	depends on BVME6000 && BROKEN

	help

	  This is the driver for the serial ports on the BVME4000 and BVME6000

	  boards from BVM Ltd.  Everyone using one of these boards should say

drivers/char/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ config SPECIALIX 


config SX

	tristate "Specialix SX (and SI) card support"

	depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)

	depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) && BROKEN

	help

	  This is a driver for the SX and SI multiport serial cards.

	  Please read the file <file:Documentation/serial/sx.txt> for details.
@@ -334,7 +334,7 @@ config SX 


config RIO

	tristate "Specialix RIO system support"

	depends on SERIAL_NONSTANDARD

	depends on SERIAL_NONSTANDARD && BROKEN

	help

	  This is a driver for the Specialix RIO, a smart serial card which

	  drives an outboard box that can support up to 128 ports.  Product
@@ -395,7 +395,7 @@ config NOZOMI 


config A2232

	tristate "Commodore A2232 serial support (EXPERIMENTAL)"

	depends on EXPERIMENTAL && ZORRO && BROKEN_ON_SMP

	depends on EXPERIMENTAL && ZORRO && BROKEN

	---help---

	  This option supports the 2232 7-port serial card shipped with the

	  Amiga 2000 and other Zorro-bus machines, dating from 1989.  At