diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-30 10:56:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-30 10:56:18 -0700 |
| commit | 2d2da475ac0eebfbf40e5c5ca8c0409d62d23424 (patch) | |
| tree | 2eecb1c2010924a767fcff86c9d80a6d1ac26b31 /arch/m68k/Kconfig.bus | |
| parent | b00ed48bb0a7c295facf9036135a573a5cdbe7de (diff) | |
| parent | 6b8be804ff376f6657ccdf6b29974e7c793d88c4 (diff) | |
| download | linux-2d2da475ac0eebfbf40e5c5ca8c0409d62d23424.tar.gz linux-2d2da475ac0eebfbf40e5c5ca8c0409d62d23424.tar.bz2 linux-2d2da475ac0eebfbf40e5c5ca8c0409d62d23424.zip | |
Merge tag 'm68knommu-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
"A collection of changes to add elf-fdpic loader support for m68k.
Also a collection of various fixes. They include typo corrections,
undefined symbol compilation fixes, removal of the ISA_DMA_API support
and removal of unused code.
Summary:
- correctly set up ZERO_PAGE pointer
- drop ISA_DMA_API support
- fix comment typos
- fixes for undefined symbols
- remove unused code and variables
- elf-fdpic loader support for m68k"
* tag 'm68knommu-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: fix 68000 CPU link with no platform selected
m68k: removed unused "mach_get_ss"
m68knommu: fix undefined reference to `mach_get_rtc_pll'
m68knommu: fix undefined reference to `_init_sp'
m68knommu: allow elf_fdpic loader to be selected
m68knommu: add definitions to support elf_fdpic program loader
m68knommu: implement minimal regset support
m68knommu: use asm-generic/mmu.h for nommu setups
m68k: fix typos in comments
m68k: coldfire: drop ISA_DMA_API support
m68knommu: set ZERO_PAGE() to the allocated zeroed page
Diffstat (limited to 'arch/m68k/Kconfig.bus')
| -rw-r--r-- | arch/m68k/Kconfig.bus | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/m68k/Kconfig.bus b/arch/m68k/Kconfig.bus index d1e93a39cd3b..d5c0b2990ee1 100644 --- a/arch/m68k/Kconfig.bus +++ b/arch/m68k/Kconfig.bus @@ -56,16 +56,6 @@ config ATARI_ROM_ISA The only driver currently using this adapter is the EtherNEC driver for RTL8019AS based NE2000 compatible network cards. -config GENERIC_ISA_DMA - def_bool ISA - source "drivers/zorro/Kconfig" endif - -if COLDFIRE - -config ISA_DMA_API - def_bool !M5272 - -endif |