diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-11-08 17:30:19 -0500 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-12-10 13:52:48 -0500 |
commit | 1d9532b3fa7f903bfcf96acc917111db491ee50d (patch) | |
tree | 8d170a43e9118f31cf63d8b7c25e516d845b0587 /arch | |
parent | f808b8650788f78bc1e5e693712e7d7603ab26bc (diff) |
m68k/serial: Remove references to obsolete CONFIG_SERIAL167
commit 51c9d654c2def97827395a7fbfd0c6f865c26544 ("Staging: delete tty
drivers") removed the MVME167 serial driver, but forgot to remove these
references.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/m68k/Kconfig.devices | 2 | ||||
-rw-r--r-- | arch/m68k/configs/multi_defconfig | 1 | ||||
-rw-r--r-- | arch/m68k/configs/mvme16x_defconfig | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices index 6033f5d4e67e..e01eeb263321 100644 --- a/arch/m68k/Kconfig.devices +++ b/arch/m68k/Kconfig.devices | |||
@@ -128,7 +128,7 @@ config DN_SERIAL | |||
128 | 128 | ||
129 | config SERIAL_CONSOLE | 129 | config SERIAL_CONSOLE |
130 | bool "Support for serial port console" | 130 | bool "Support for serial port console" |
131 | depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || MULTIFACE_III_TTY=y || SERIAL=y || SERIAL167 || DN_SERIAL) | 131 | depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || MULTIFACE_III_TTY=y || SERIAL=y || DN_SERIAL) |
132 | ---help--- | 132 | ---help--- |
133 | If you say Y here, it will be possible to use a serial port as the | 133 | If you say Y here, it will be possible to use a serial port as the |
134 | system console (the system console is the device which receives all | 134 | system console (the system console is the device which receives all |
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index ad9e85760e34..958a7ce49dee 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig | |||
@@ -323,7 +323,6 @@ CONFIG_ATARI_MIDI=y | |||
323 | CONFIG_ATARI_DSP56K=m | 323 | CONFIG_ATARI_DSP56K=m |
324 | CONFIG_AMIGA_BUILTIN_SERIAL=y | 324 | CONFIG_AMIGA_BUILTIN_SERIAL=y |
325 | CONFIG_MULTIFACE_III_TTY=m | 325 | CONFIG_MULTIFACE_III_TTY=m |
326 | CONFIG_SERIAL167=y | ||
327 | CONFIG_DN_SERIAL=y | 326 | CONFIG_DN_SERIAL=y |
328 | CONFIG_SERIAL_CONSOLE=y | 327 | CONFIG_SERIAL_CONSOLE=y |
329 | CONFIG_EXT2_FS=y | 328 | CONFIG_EXT2_FS=y |
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index c45aaf3b816f..6dd12e62b41b 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig | |||
@@ -218,7 +218,6 @@ CONFIG_GEN_RTC_X=y | |||
218 | CONFIG_HID=m | 218 | CONFIG_HID=m |
219 | CONFIG_HIDRAW=y | 219 | CONFIG_HIDRAW=y |
220 | # CONFIG_USB_SUPPORT is not set | 220 | # CONFIG_USB_SUPPORT is not set |
221 | CONFIG_SERIAL167=y | ||
222 | CONFIG_SERIAL_CONSOLE=y | 221 | CONFIG_SERIAL_CONSOLE=y |
223 | CONFIG_EXT2_FS=y | 222 | CONFIG_EXT2_FS=y |
224 | CONFIG_EXT3_FS=y | 223 | CONFIG_EXT3_FS=y |