diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-08 05:40:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-08 05:40:17 -0400 |
| commit | 0223f9aaef94a09ffc0b6abcba732e62a483b88c (patch) | |
| tree | 3cf04190e2698415d6e80756c9fb4516f190c671 /arch/m68k/Kconfig.devices | |
| parent | 8a9e838f59115e55ca206fb5f0b567d7b3540517 (diff) | |
| parent | 24cae7934cf1455c9793a95376a206ca6b965ade (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
"Summary:
- a fix for an intermittent crash in macsonic and hilkbd, marked for
stable,
- build fixes for uncommon configs.
Note: "m68k: AMIGA_BUILTIN_SERIAL should depend on TTY" was also
picked up by GregKH for his TTY/Serial patches tree"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Reformat arch/m68k/mm/hwtest.c
m68k: Disable/restore interrupts in hwreg_present()/hwreg_write()
m68k: AMIGA_BUILTIN_SERIAL should depend on TTY
m68k: Add missing ioport_unmap()
m68k/atari - stram: Add missing #include <linux/ioport.h>
Diffstat (limited to 'arch/m68k/Kconfig.devices')
| -rw-r--r-- | arch/m68k/Kconfig.devices | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices index 2a74777667f..42b6fcfc30e 100644 --- a/arch/m68k/Kconfig.devices +++ b/arch/m68k/Kconfig.devices @@ -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. |