---

yaml
---
r: 201415
b: refs/heads/master
c: c1b2d97
h: refs/heads/master
i:
  201413: 4c66fe7
  201411: f19fcbd
  201407: c53f26c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5aaf254409f8d58229107b59507a8235b715a960
+refs/heads/master: c1b2d9704c77ddaec46d5d681e1360ac40268743

trunk/arch/arm/Kconfig

@@ -1031,11 +1031,6 @@ endmenu
 
 source "arch/arm/common/Kconfig"
 
-config FORCE_MAX_ZONEORDER
-	int
-	depends on SA1111
-	default "9"
-
 menu "Bus support"
 
 config ARM_AMBA
@@ -1304,6 +1299,22 @@ config SPARSE_IRQ
 
 source "mm/Kconfig"
 
+config FORCE_MAX_ZONEORDER
+	int "Maximum zone order" if ARCH_SHMOBILE
+	range 11 64 if ARCH_SHMOBILE
+	default "9" if SA1111
+	default "11"
+	help
+	  The kernel memory allocator divides physically contiguous memory
+	  blocks into "zones", where each zone is a power of two number of
+	  pages.  This option selects the largest power of two that the kernel
+	  keeps in the memory allocator.  If you need to allocate very large
+	  blocks of physically contiguous memory, then you may need to
+	  increase this value.
+
+	  This config option is actually maximum order plus one. For example,
+	  a value of 11 means that the largest free memory block is 2^10 pages.
+
 config LEDS
 	bool "Timer and CPU usage LEDs"
 	depends on ARCH_CDB89712 || ARCH_EBSA110 || \