projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'origin' into master
[firefly-linux-kernel-4.4.55.git]
/
arch
/
powerpc
/
Kconfig
diff --git
a/arch/powerpc/Kconfig
b/arch/powerpc/Kconfig
index 9391199d9e7731d166b45130fa322e27936b1da0..369d93e7377cfc1b0ae7afbd3e8f91869102768a 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 ARCH_PHYS_ADDR_T_64BIT
def_bool PPC64 || PHYS_64BIT