diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-11 12:50:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-11 12:50:54 -0700 |
| commit | d3ea693439833b5ed9b932512e9a90b9381035c9 (patch) | |
| tree | 7abf66035b35ba6e8df31aae67b7e0c6be6f551c /arch/m68k/configs | |
| parent | 2dca74a40e1e7ff45079d85fc507769383039b9d (diff) | |
| parent | 9e2b6ed41f8f99c97b13c9d15cbef235dbd97fb6 (diff) | |
| download | linux-stable-d3ea693439833b5ed9b932512e9a90b9381035c9.tar.gz linux-stable-d3ea693439833b5ed9b932512e9a90b9381035c9.tar.bz2 linux-stable-d3ea693439833b5ed9b932512e9a90b9381035c9.zip | |
Merge tag 'm68knommu-for-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
- casting clean up in the user access macros
- memory leak on error case fix for PCI probing
- update of a defconfig
* tag 'm68knommu-for-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k,nommu: fix implicit cast from __user in __{get,put}_user_asm()
m68k,nommu: add missing __user in uaccess' __ptr() macro
m68k: Drop CONFIG_MTD_M25P80 in stmark2_defconfig
m68k/PCI: Fix a memory leak in an error handling path
Diffstat (limited to 'arch/m68k/configs')
| -rw-r--r-- | arch/m68k/configs/stmark2_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/configs/stmark2_defconfig b/arch/m68k/configs/stmark2_defconfig index 27fa9465d19d..2b746f55f419 100644 --- a/arch/m68k/configs/stmark2_defconfig +++ b/arch/m68k/configs/stmark2_defconfig @@ -48,7 +48,6 @@ CONFIG_MTD_CFI_STAA=y CONFIG_MTD_ROM=y CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PLATRAM=y -CONFIG_MTD_M25P80=y CONFIG_MTD_SPI_NOR=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set |