summaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-12-12 01:19:16 +0100
committerTony Lindgren <tony@atomide.com>2009-12-12 01:19:16 +0100
commit5ccf197859d6f6bcf56e85657019503b2d95767a (patch)
tree85cb5562b550571297cdd347a578ae337eb8f39f /Documentation/kernel-parameters.txt
parentMerge branch 'for_2_6_33' of git://git.pwsan.com/linux-2.6 into omap-for-linus (diff)
parentomap3: Fix OMAP35XX_REV macros (diff)
downloadlinux-5ccf197859d6f6bcf56e85657019503b2d95767a.tar.xz
linux-5ccf197859d6f6bcf56e85657019503b2d95767a.zip
Merge branch 'for-next' into omap-for-linus
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 777dc8a32df8..4f62fcbce108 100644
--- a/Documentation/kernel-parameters.txt
+++ b/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>