diff options
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 9391199d9e77..369d93e7377c 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 ARCH_PHYS_ADDR_T_64BIT | 22 | config ARCH_PHYS_ADDR_T_64BIT |
| 26 | def_bool PPC64 || PHYS_64BIT | 23 | def_bool PPC64 || PHYS_64BIT |
| 27 | 24 | ||