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 /drivers/acpi/Kconfig | |
| parent | a733a5da97b238e3e3167d3d0aee8fe1e8d04e97 (diff) | |
| parent | 04d94886b47b5133915021dcfb1108a8576f6ea7 (diff) | |
Merge branches 'release' and 'dsdt-override' into release
Diffstat (limited to 'drivers/acpi/Kconfig')
| -rw-r--r-- | drivers/acpi/Kconfig | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index d141bdb3a7d4..7ef172c2a1d6 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -276,8 +276,10 @@ config ACPI_CUSTOM_DSDT depends on !STANDALONE default n help - This option is to load a custom ACPI DSDT - If you don't know what that is, say N. + This option supports a custom DSDT by linking it into the kernel. + See Documentation/acpi/dsdt-override.txt + + If unsure, say N. config ACPI_CUSTOM_DSDT_FILE string "Custom DSDT Table file to include" @@ -287,6 +289,17 @@ config ACPI_CUSTOM_DSDT_FILE Enter the full path name to the file which includes the AmlCode declaration. +config ACPI_CUSTOM_DSDT_INITRD + bool "Read Custom DSDT from initramfs" + depends on BLK_DEV_INITRD + default n + help + This option supports a custom DSDT by optionally loading it from initrd. + See Documentation/acpi/dsdt-override.txt + + If you are not using this feature now, but may use it later, + it is safe to say Y here. + config ACPI_BLACKLIST_YEAR int "Disable ACPI for systems before Jan 1st this year" if X86_32 default 0 |