diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-30 13:57:06 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-30 13:57:06 +1000 |
| commit | 583e5136f69588ffbc4f0cc5c2c2592f455ef5f6 (patch) | |
| tree | d70ce617254d0e6f9102496dbe2471e39b57eafb /Documentation | |
| parent | c5943c881bfc77b5380f936745bf5f92503d89f5 (diff) | |
| parent | 0aea531326d1a17ccef7d9a538429c5b32cf4f12 (diff) | |
Merge commit 'pci/linux-next'
Conflicts:
arch/x86/kernel/setup_64.c
arch/x86/pci/irq.c
arch/x86/pci/pci.h
include/linux/device.h
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 2f7c58c827db..9becb290c1e4 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -147,10 +147,14 @@ and is between 256 and 4096 characters. It is defined in the file default: 0 acpi_sleep= [HW,ACPI] Sleep options - Format: { s3_bios, s3_mode, s3_beep } + Format: { s3_bios, s3_mode, s3_beep, old_ordering } See Documentation/power/video.txt for s3_bios and s3_mode. s3_beep is for debugging; it makes the PC's speaker beep as soon as the kernel's real-mode entry point is called. + old_ordering causes the ACPI 1.0 ordering of the _PTS + control method, wrt putting devices into low power + states, to be enforced (the ACPI 2.0 ordering of _PTS is + used by default). acpi_sci= [HW,ACPI] ACPI System Control Interrupt trigger mode Format: { level | edge | high | low } @@ -1523,6 +1527,9 @@ and is between 256 and 4096 characters. It is defined in the file Use with caution as certain devices share address decoders between ROMs and other resources. + norom [X86-32,X86_64] Do not assign address space to + expansion ROMs that do not already have + BIOS assigned address ranges. irqmask=0xMMMM [X86-32] Set a bit mask of IRQs allowed to be assigned automatically to PCI devices. You can make the kernel exclude IRQs of your ISA cards |