powerpc: Remove Kconfig support for PPC_MERGE
There are no users of PPC_MERGE in tree so we can get rid of it. It was a hold over from the arch/ppc days. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
a3ba68f969
commit
dbc1c5c250
|
@ -19,9 +19,6 @@ config WORD_SIZE
|
||||||
default 64 if PPC64
|
default 64 if PPC64
|
||||||
default 32 if !PPC64
|
default 32 if !PPC64
|
||||||
|
|
||||||
config PPC_MERGE
|
|
||||||
def_bool y
|
|
||||||
|
|
||||||
config MMU
|
config MMU
|
||||||
bool
|
bool
|
||||||
default y
|
default y
|
||||||
|
|
Loading…
Reference in a new issue