diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2008-02-22 14:25:04 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-02-23 00:15:11 -0500 |
commit | 7ce9573e093891f5807e6e50f3bd2012f1e5d0fe (patch) | |
tree | 0bf9bfdf828b57e35171e543e02e68de1c9cadb3 /drivers | |
parent | 39273b58a409cd6d65c9732bdca00bacd1626672 (diff) |
ACPI: prevent randconfig build failure on empty ACPI_CUSTOM_DSDT_FILE
Make ACPI_CUSTOM_DSDT boolean config symbol a hidden and derived
value, based on the value of ACPI_CUSTOM_DSDT_FILE (string).
Only the latter is presented to the user as a config option.
This fixes problems with "make randconfig" setting ACPI_CUSTOM_DSDT
but leaving ACPI_CUSTOM_DSDT_FILE empty/blank.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/Kconfig | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index f688c214be0c..fbcaa069be86 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -283,24 +283,23 @@ config ACPI_TOSHIBA | |||
283 | If you have a legacy free Toshiba laptop (such as the Libretto L1 | 283 | If you have a legacy free Toshiba laptop (such as the Libretto L1 |
284 | series), say Y. | 284 | series), say Y. |
285 | 285 | ||
286 | config ACPI_CUSTOM_DSDT | 286 | config ACPI_CUSTOM_DSDT_FILE |
287 | bool "Include Custom DSDT" | 287 | string "Custom DSDT Table file to include" |
288 | default "" | ||
288 | depends on !STANDALONE | 289 | depends on !STANDALONE |
289 | default n | ||
290 | help | 290 | help |
291 | This option supports a custom DSDT by linking it into the kernel. | 291 | This option supports a custom DSDT by linking it into the kernel. |
292 | See Documentation/acpi/dsdt-override.txt | 292 | See Documentation/acpi/dsdt-override.txt |
293 | 293 | ||
294 | If unsure, say N. | ||
295 | |||
296 | config ACPI_CUSTOM_DSDT_FILE | ||
297 | string "Custom DSDT Table file to include" | ||
298 | depends on ACPI_CUSTOM_DSDT | ||
299 | default "" | ||
300 | help | ||
301 | Enter the full path name to the file which includes the AmlCode | 294 | Enter the full path name to the file which includes the AmlCode |
302 | declaration. | 295 | declaration. |
303 | 296 | ||
297 | If unsure, don't enter a file name. | ||
298 | |||
299 | config ACPI_CUSTOM_DSDT | ||
300 | bool | ||
301 | default ACPI_CUSTOM_DSDT_FILE != "" | ||
302 | |||
304 | config ACPI_CUSTOM_DSDT_INITRD | 303 | config ACPI_CUSTOM_DSDT_INITRD |
305 | bool "Read Custom DSDT from initramfs" | 304 | bool "Read Custom DSDT from initramfs" |
306 | depends on BLK_DEV_INITRD | 305 | depends on BLK_DEV_INITRD |