diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-29 00:01:03 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-29 00:01:03 +0300 |
| commit | 17cfb9d332243f6d2551818df27d666d3dd70a23 (patch) | |
| tree | 2065b5335cf2f17eea5b4d34bf25c7cee1c5a8df /drivers | |
| parent | 1b1cf8fe99830e8c95f0fe110b02ba51c2bbc4e0 (diff) | |
| parent | c1367ee016e3550745315fb9a2dd1e4ce02cdcf6 (diff) | |
| download | linux-17cfb9d332243f6d2551818df27d666d3dd70a23.tar.xz | |
Merge tag 'm68k-for-v5.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- update Finn's email address in MAINTAINERS
- defconfig updates
- minor fixes and improvements
* tag 'm68k-for-v5.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: atari: Fix ATARI_KBD_CORE kconfig unmet dependency warning
m68k: defconfig: Update defconfigs for v5.13-rc1
MAINTAINERS, .mailmap: Update Finn Thain's email address
m68k: dma: Remove unnecessary include of asm/cacheflush.h
m68k: Drop -fno-strength-reduce from KBUILD_CFLAGS
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/keyboard/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 32d15809ae58..40a070a2e7f5 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -67,9 +67,6 @@ config KEYBOARD_AMIGA To compile this driver as a module, choose M here: the module will be called amikbd. -config ATARI_KBD_CORE - bool - config KEYBOARD_APPLESPI tristate "Apple SPI keyboard and trackpad" depends on ACPI && EFI |