summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-28 19:30:24 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-28 19:30:24 -0700
commit933a6208d84c92d92f9264a2e28d0fc317d41fd1 (patch)
treedd774882b46c47bbe7ee44a317ecca34b234993f /Documentation
parent715dad5992b1466320c1ac674db46297e57acf21 (diff)
parentf191f144079b0083c6fa7d01a4acbd7263fb5032 (diff)
downloadlinux-933a6208d84c92d92f9264a2e28d0fc317d41fd1.tar.gz
linux-933a6208d84c92d92f9264a2e28d0fc317d41fd1.tar.bz2
linux-933a6208d84c92d92f9264a2e28d0fc317d41fd1.zip
Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6
* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6: agp: AMD AGP is used on UP1100 & UP1500 alpha boxen intel_agp: really fix 945/965GME agp: don't lock pages AGP: document boot options Fix "use after free" / "double free" bug in ati_create_gatt_pages / ati_free_gatt_pages
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index fb80e9ffea68..1156653338fe 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -30,6 +30,7 @@ the beginning of each description states the restrictions within which a
parameter is applicable:
ACPI ACPI support is enabled.
+ AGP AGP (Accelerated Graphics Port) is enabled.
ALSA ALSA sound support is enabled.
APIC APIC support is enabled.
APM Advanced Power Management support is enabled.
@@ -227,6 +228,12 @@ and is between 256 and 4096 characters. It is defined in the file
to assume that this machine's pmtimer latches its value
and always returns good values.
+ agp= [AGP]
+ { off | try_unsupported }
+ off: disable AGP support
+ try_unsupported: try to drive unsupported chipsets
+ (may crash computer or cause data corruption)
+
enable_timer_pin_1 [i386,x86-64]
Enable PIN 1 of APIC timer
Can be useful to work around chipset bugs