aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMurali Karicheri2015-01-22 09:51:09 -0600
committerMurali Karicheri2015-01-22 09:51:09 -0600
commit06660a2484590181f6103830759e870a16cac5c4 (patch)
tree0b844722a533fd85bf561cc18c50df7c124687ce
parentdd2c4cfa5d3fc5ef26697c94895d35a4c26a150a (diff)
parent6e06c6e6c72581cbeeb4dadfd38096db83435c00 (diff)
downloadlinux-06660a2484590181f6103830759e870a16cac5c4.tar.gz
linux-06660a2484590181f6103830759e870a16cac5c4.tar.xz
linux-06660a2484590181f6103830759e870a16cac5c4.zip
Merge branch 'v3.10.61/rebuild/12-keystone-machine' into v3.10.61/master
-rw-r--r--arch/arm/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index aeb92ecc19a..e73732ea96e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1786,7 +1786,7 @@ config HW_PERF_EVENTS
1786source "mm/Kconfig" 1786source "mm/Kconfig"
1787 1787
1788config FORCE_MAX_ZONEORDER 1788config FORCE_MAX_ZONEORDER
1789 int "Maximum zone order" if ARCH_SHMOBILE 1789 int "Maximum zone order" if ARCH_SHMOBILE || ARCH_KEYSTONE
1790 range 11 64 if ARCH_SHMOBILE 1790 range 11 64 if ARCH_SHMOBILE
1791 default "12" if SOC_AM33XX 1791 default "12" if SOC_AM33XX
1792 default "9" if SA1111 1792 default "9" if SA1111