---

yaml --- r: 175650 b: refs/heads/master c: 15ac7af h: refs/heads/master v: v3
git-mirror · Dec 12, 2009 · d85bc4b · d85bc4b
1 parent 3f846e6
commit d85bc4b
Show file tree

Hide file tree

Showing 5 changed files with 612 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92c9f5018997dbc5f5e91eae2400d78ada2760b0
+refs/heads/master: 15ac7afe515631ec36966b1cf632a87276536f57
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
@@ -1787,6 +1787,11 @@ and is between 256 and 4096 characters. It is defined in the file
 			waiting for the ACK, so if this is set too high
 			interrupts *may* be lost!
 
+	omap_mux=	[OMAP] Override bootloader pin multiplexing.
+			Format: <mux_mode0.mode_name=value>...
+			For example, to override I2C bus2:
+			omap_mux=i2c2_scl.i2c2_scl=0x100,i2c2_sda.i2c2_sda=0x100
+
 	opl3=		[HW,OSS]
 			Format: <io>