diff options
author | Len Brown <len.brown@intel.com> | 2008-02-07 04:01:53 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-02-07 04:01:53 -0500 |
commit | 81e242d0efafb319938d511b115088a5c4523c91 (patch) | |
tree | be22aa41db2288fd7999524d719f333c766a367f /Documentation/acpi/dsdt-override.txt | |
parent | a733a5da97b238e3e3167d3d0aee8fe1e8d04e97 (diff) | |
parent | 04d94886b47b5133915021dcfb1108a8576f6ea7 (diff) | |
download | linux-81e242d0efafb319938d511b115088a5c4523c91.tar.gz linux-81e242d0efafb319938d511b115088a5c4523c91.tar.xz |
Merge branches 'release' and 'dsdt-override' into release
Diffstat (limited to 'Documentation/acpi/dsdt-override.txt')
-rw-r--r-- | Documentation/acpi/dsdt-override.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/acpi/dsdt-override.txt b/Documentation/acpi/dsdt-override.txt new file mode 100644 index 000000000000..5008f256a2db --- /dev/null +++ b/Documentation/acpi/dsdt-override.txt @@ -0,0 +1,15 @@ +Linux supports two methods of overriding the BIOS DSDT: + +CONFIG_ACPI_CUSTOM_DSDT builds the image into the kernel. + +CONFIG_ACPI_CUSTOM_DSDT_INITRD adds the image to the initrd. + +When to use these methods is described in detail on the +Linux/ACPI home page: +http://www.lesswatts.org/projects/acpi/overridingDSDT.php + +Note that if both options are used, the DSDT supplied +by the INITRD method takes precedence. + +Documentation/initramfs-add-dsdt.sh is provided for convenience +for use with the CONFIG_ACPI_CUSTOM_DSDT_INITRD method. |