tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds fa488e22 a9fd74cb

+6 -6
unified split
+3 -3
arch/m68k/Kconfig
··· 561 562 config MVME147_SCC 563 bool "SCC support for MVME147 serial ports" 564 - depends on MVME147 565 help 566 This is the driver for the serial ports on the Motorola MVME147 567 boards. Everyone using one of these boards should say Y here. ··· 576 577 config MVME162_SCC 578 bool "SCC support for MVME162 serial ports" 579 - depends on MVME16x 580 help 581 This is the driver for the serial ports on the Motorola MVME162 and 582 172 boards. Everyone using one of these boards should say Y here. 583 584 config BVME6000_SCC 585 bool "SCC support for BVME6000 serial ports" 586 - depends on BVME6000 587 help 588 This is the driver for the serial ports on the BVME4000 and BVME6000 589 boards from BVM Ltd. Everyone using one of these boards should say
··· 561 562 config MVME147_SCC 563 bool "SCC support for MVME147 serial ports" 564 + depends on MVME147 && BROKEN 565 help 566 This is the driver for the serial ports on the Motorola MVME147 567 boards. Everyone using one of these boards should say Y here. ··· 576 577 config MVME162_SCC 578 bool "SCC support for MVME162 serial ports" 579 + depends on MVME16x && BROKEN 580 help 581 This is the driver for the serial ports on the Motorola MVME162 and 582 172 boards. Everyone using one of these boards should say Y here. 583 584 config BVME6000_SCC 585 bool "SCC support for BVME6000 serial ports" 586 + depends on BVME6000 && BROKEN 587 help 588 This is the driver for the serial ports on the BVME4000 and BVME6000 589 boards from BVM Ltd. Everyone using one of these boards should say
+3 -3
drivers/char/Kconfig
··· 323 324 config SX 325 tristate "Specialix SX (and SI) card support" 326 - depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) 327 help 328 This is a driver for the SX and SI multiport serial cards. 329 Please read the file <file:Documentation/serial/sx.txt> for details. ··· 334 335 config RIO 336 tristate "Specialix RIO system support" 337 - depends on SERIAL_NONSTANDARD 338 help 339 This is a driver for the Specialix RIO, a smart serial card which 340 drives an outboard box that can support up to 128 ports. Product ··· 395 396 config A2232 397 tristate "Commodore A2232 serial support (EXPERIMENTAL)" 398 - depends on EXPERIMENTAL && ZORRO && BROKEN_ON_SMP 399 ---help--- 400 This option supports the 2232 7-port serial card shipped with the 401 Amiga 2000 and other Zorro-bus machines, dating from 1989. At
··· 323 324 config SX 325 tristate "Specialix SX (and SI) card support" 326 + depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) && BROKEN 327 help 328 This is a driver for the SX and SI multiport serial cards. 329 Please read the file <file:Documentation/serial/sx.txt> for details. ··· 334 335 config RIO 336 tristate "Specialix RIO system support" 337 + depends on SERIAL_NONSTANDARD && BROKEN 338 help 339 This is a driver for the Specialix RIO, a smart serial card which 340 drives an outboard box that can support up to 128 ports. Product ··· 395 396 config A2232 397 tristate "Commodore A2232 serial support (EXPERIMENTAL)" 398 + depends on EXPERIMENTAL && ZORRO && BROKEN 399 ---help--- 400 This option supports the 2232 7-port serial card shipped with the 401 Amiga 2000 and other Zorro-bus machines, dating from 1989. At