Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / m68k / Kconfig.devices

diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices
index d163991c571727bcda78a980d5910e74435b60be..42b6fcfc30ef5ae7089cf76c051118957ff5ee8d 100644 (file)
--- a/arch/m68k/Kconfig.devices
+++ b/arch/m68k/Kconfig.devices
@@ -73,7 +73,7 @@ config ATARI_ETHERNEC
          ROM port. The driver works by polling instead of interrupts, so it
          is quite slow.
 
-         This driver also suppports the ethernet part of the NetUSBee ROM
+         This driver also supports the ethernet part of the NetUSBee ROM
          port combined Ethernet/USB adapter.
 
          To compile the actual ethernet driver, choose Y or M in for the NE2000
@@ -95,7 +95,7 @@ config ATARI_DSP56K
 
 config AMIGA_BUILTIN_SERIAL
        tristate "Amiga builtin serial support"
-       depends on AMIGA
+       depends on AMIGA && TTY
        help
          If you want to use your Amiga's built-in serial port in Linux,
          answer Y.