aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-01-10 19:50:58 -0800
committerTony Luck <tony.luck@intel.com>2005-01-10 19:50:58 -0800
commit3c6c37215e29e6e58171e775b15deda1f2f167c6 (patch)
tree94c433032fbc7bfaacf0cfbbc08ec8c17cc1cbd2 /Documentation
parent307bc76b2bd60b153e529090680c1dceb4fc3498 (diff)
parent872a9465d098476c5cf2e21c53deb70be31b3270 (diff)
downloadhistory-3c6c37215e29e6e58171e775b15deda1f2f167c6.tar.gz
Merge intel.com:/data/home/aegl/BK/Linus
into intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.11
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 26f119c12940be..b6a0c0fc50df79 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -673,7 +673,11 @@ running once the system is up.
mac53c9x= [HW,SCSI]
Format: <num_esps>,<disconnect>,<nosync>,<can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags>
-
+
+ machvec= [IA64]
+ Force the use of a particular machine-vector (machvec) in a generic
+ kernel. Example: machvec=hpzx1_swiotlb
+
mad16= [HW,OSS]
Format: <io>,<irq>,<dma>,<dma16>,<mpu_io>,<mpu_irq>,<joystick>