diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 16:16:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 16:16:39 -0800 |
| commit | 18a44a7ff1075ce5157ac07cde573aca6b5e9973 (patch) | |
| tree | 8b857b12887da983b75bfd0d693df23edb810ba5 /drivers | |
| parent | 309667e53fcfd8e0b423280b6ea5a648fd92166c (diff) | |
| parent | 7c10093692ed2e6f318387d96b829320aa0ca64c (diff) | |
| download | linux-18a44a7ff1075ce5157ac07cde573aca6b5e9973.tar.bz2 | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull more x86 fixes from Peter Anvin:
"Additional x86 fixes. Three of these patches are pure documentation,
two are pretty trivial; the remaining one fixes boot problems on some
non-BIOS machines."
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Make sure we can boot in the case the BDA contains pure garbage
x86, efi: Mark disable_runtime as __initdata
x86, doc: Fix incorrect comment about 64-bit code segment descriptors
doc, kernel-parameters: Document 'console=hvc<n>'
doc, xen: Mention 'earlyprintk=xen' in the documentation.
ACPI: Overriding ACPI tables via initrd only works with an initrd and on X86
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 320006019e68..92ed9692c47e 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -266,7 +266,8 @@ config ACPI_CUSTOM_DSDT default ACPI_CUSTOM_DSDT_FILE != "" config ACPI_INITRD_TABLE_OVERRIDE - bool "ACPI tables can be passed via uncompressed cpio in initrd" + bool "ACPI tables override via initrd" + depends on BLK_DEV_INITRD && X86 default n help This option provides functionality to override arbitrary ACPI tables |