diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-10-20 04:03:46 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 00:19:11 -0400 |
| commit | dbc1c5c250cbedccf3571597d156e581e34b2944 (patch) | |
| tree | 771df5aa8e938a6caf35bd06a9e9be6589421b84 /arch/powerpc/Kconfig | |
| parent | a3ba68f969b2407b6809a840f6ff45ab0eb06f84 (diff) | |
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>
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index c171f5bcf25..bbe149c2651 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -19,9 +19,6 @@ config WORD_SIZE | |||
| 19 | default 64 if PPC64 | 19 | default 64 if PPC64 |
| 20 | default 32 if !PPC64 | 20 | default 32 if !PPC64 |
| 21 | 21 | ||
| 22 | config PPC_MERGE | ||
| 23 | def_bool y | ||
| 24 | |||
| 25 | config MMU | 22 | config MMU |
| 26 | bool | 23 | bool |
| 27 | default y | 24 | default y |