projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a3ba68f)
powerpc: Remove Kconfig support for PPC_MERGE
authorKumar Gala <galak@kernel.crashing.org>
Mon, 20 Oct 2008 08:03:46 +0000 (08:03 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 21 Oct 2008 04:19:11 +0000 (15:19 +1100)
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>
arch/powerpc/Kconfig patch | blob | blame | history

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index c171f5bcf258928d16a15b6179c68f6b46c171d5..bbe149c2651805c7835d238a38e7bc04ff940620 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -19,9 +19,6 @@ config WORD_SIZE
        default 64 if PPC64
        default 32 if !PPC64
 
-config PPC_MERGE
-       def_bool y
-
 config MMU
        bool
        default y