---

yaml --- r: 358430 b: refs/heads/master c: 8c8803c h: refs/heads/master v: v3
git-mirror · Jan 31, 2013 · 6beedcc · 6beedcc
1 parent 3af7102
commit 6beedcc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c531d82ee1a220ae7132ba0eb31edaf186b56d1
+refs/heads/master: 8c8803c5968bd82ad3d65e8603c6bcf2d9674d83
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
@@ -2248,6 +2248,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 				the default.
 				off: Turn ECRC off
 				on: Turn ECRC on.
+		hpiosize=nn[KMG]	The fixed amount of bus space which is
+				reserved for hotplug bridge's IO window.
+				Default size is 256 bytes.
+		hpmemsize=nn[KMG]	The fixed amount of bus space which is
+				reserved for hotplug bridge's memory window.
+				Default size is 2 megabytes.
 		realloc=	Enable/disable reallocating PCI bridge resources
 				if allocations done by BIOS are too small to
 				accommodate resources required by all child