diff --git a/[refs] b/[refs] index d3cd37596898..a6b629b7b737 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f806819270bb1170057cfe9ed5c466f3535be83 +refs/heads/master: 898f08e159bb63eaa5843f8dc0dab9592d4bae4c diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 8ac460a8f4ca..c0065c777e9b 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -1758,6 +1758,7 @@ source "mm/Kconfig" config FORCE_MAX_ZONEORDER int "Maximum zone order" if ARCH_SHMOBILE range 11 64 if ARCH_SHMOBILE + default "12" if SOC_AM33XX default "9" if SA1111 default "11" help