git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-4.20-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
[sfrench/cifs-2.6.git]
/
arch
/
m68k
/
Kconfig
diff --git
a/arch/m68k/Kconfig
b/arch/m68k/Kconfig
index c7b2a8d60a41e00711a9ab9589a6af1d7afeb2a1..1bc9f1ba759a7bb3ab66c1f53ef531642048070b 100644
(file)
--- a/
arch/m68k/Kconfig
+++ b/
arch/m68k/Kconfig
@@
-27,9
+27,7
@@
config M68K
select OLD_SIGSUSPEND3
select OLD_SIGACTION
select DMA_DIRECT_OPS if HAS_DMA
- select HAVE_MEMBLOCK
select ARCH_DISCARD_MEMBLOCK
- select NO_BOOTMEM
config CPU_BIG_ENDIAN
def_bool y