diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-31 15:15:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-31 15:15:58 -0400 |
| commit | fa488e22864370b610e61b540efe10ab4a41865b (patch) | |
| tree | 0f8deff1272ed09544dbdd003bd40b5f665f1091 /drivers | |
| parent | a9fd74cb5843d8b2e44fb42f792766649ad24bfc (diff) | |
| parent | 412145947adfca60a4b5b4893fbae82dffa25edd (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 08a6f50ae791..6aad99ec4e0f 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
| @@ -323,7 +323,7 @@ config SPECIALIX | |||
| 323 | 323 | ||
| 324 | config SX | 324 | config SX |
| 325 | tristate "Specialix SX (and SI) card support" | 325 | tristate "Specialix SX (and SI) card support" |
| 326 | depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) | 326 | depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) && BROKEN |
| 327 | help | 327 | help |
| 328 | This is a driver for the SX and SI multiport serial cards. | 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. | 329 | Please read the file <file:Documentation/serial/sx.txt> for details. |
| @@ -334,7 +334,7 @@ config SX | |||
| 334 | 334 | ||
| 335 | config RIO | 335 | config RIO |
| 336 | tristate "Specialix RIO system support" | 336 | tristate "Specialix RIO system support" |
| 337 | depends on SERIAL_NONSTANDARD | 337 | depends on SERIAL_NONSTANDARD && BROKEN |
| 338 | help | 338 | help |
| 339 | This is a driver for the Specialix RIO, a smart serial card which | 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 | 340 | drives an outboard box that can support up to 128 ports. Product |
| @@ -395,7 +395,7 @@ config NOZOMI | |||
| 395 | 395 | ||
| 396 | config A2232 | 396 | config A2232 |
| 397 | tristate "Commodore A2232 serial support (EXPERIMENTAL)" | 397 | tristate "Commodore A2232 serial support (EXPERIMENTAL)" |
| 398 | depends on EXPERIMENTAL && ZORRO && BROKEN_ON_SMP | 398 | depends on EXPERIMENTAL && ZORRO && BROKEN |
| 399 | ---help--- | 399 | ---help--- |
| 400 | This option supports the 2232 7-port serial card shipped with the | 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 | 401 | Amiga 2000 and other Zorro-bus machines, dating from 1989. At |