diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-07-17 15:16:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-20 20:24:40 -0400 |
commit | 7ccaee5cadd7a771773bbb878e139697511ebdde (patch) | |
tree | 17035ccf6541695ae4e0625d922b4fb4694c8a8d | |
parent | 62bc654e794feb5242c31a59dcc36bab64f7d917 (diff) |
m68k/Atari: remove the dead ATARI_SCC{,_DMA} options
It seems the driver was removed back in kernel 2.3 but the options were
forgotten.
Reported-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/m68k/Kconfig | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 8012ff7d7513..8c5e1de68fcb 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig | |||
@@ -490,28 +490,6 @@ config ATARI_MFPSER | |||
490 | Note for Falcon users: You also have an MFP port, it's just not | 490 | Note for Falcon users: You also have an MFP port, it's just not |
491 | wired to the outside... But you could use the port under Linux. | 491 | wired to the outside... But you could use the port under Linux. |
492 | 492 | ||
493 | config ATARI_SCC | ||
494 | tristate "Atari SCC serial support" | ||
495 | depends on ATARI | ||
496 | ---help--- | ||
497 | If you have serial ports based on a Zilog SCC chip (Modem2, Serial2, | ||
498 | LAN) and like to use them under Linux, say Y. All built-in SCC's are | ||
499 | supported (TT, MegaSTE, Falcon), and also the ST-ESCC. If you have | ||
500 | two connectors for channel A (Serial2 and LAN), they are visible as | ||
501 | two separate devices. | ||
502 | |||
503 | To compile this driver as a module, choose M here. | ||
504 | |||
505 | config ATARI_SCC_DMA | ||
506 | bool "Atari SCC serial DMA support" | ||
507 | depends on ATARI_SCC | ||
508 | help | ||
509 | This enables DMA support for receiving data on channel A of the SCC. | ||
510 | If you have a TT you may say Y here and read | ||
511 | drivers/char/atari_SCC.README. All other users should say N here, | ||
512 | because only the TT has SCC-DMA, even if your machine keeps claiming | ||
513 | so at boot time. | ||
514 | |||
515 | config ATARI_MIDI | 493 | config ATARI_MIDI |
516 | tristate "Atari MIDI serial support" | 494 | tristate "Atari MIDI serial support" |
517 | depends on ATARI | 495 | depends on ATARI |
@@ -628,7 +606,7 @@ config DN_SERIAL | |||
628 | 606 | ||
629 | config SERIAL_CONSOLE | 607 | config SERIAL_CONSOLE |
630 | bool "Support for serial port console" | 608 | bool "Support for serial port console" |
631 | depends on (AMIGA || ATARI || MAC || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_SCC=y || ATARI_MIDI=y || MAC_SCC=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL) | 609 | depends on (AMIGA || ATARI || MAC || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || MAC_SCC=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL) |
632 | ---help--- | 610 | ---help--- |
633 | If you say Y here, it will be possible to use a serial port as the | 611 | If you say Y here, it will be possible to use a serial port as the |
634 | system console (the system console is the device which receives all | 612 | system console (the system console is the device which receives all |