Similarly to DCDBAS for DELL_SMBIOS_SMM, if DELL_SMBIOS_WMI is enabled, DELL_SMBIOS becomes dependent on ACPI_WMI. Update the depends line to prevent a configuration where DELL_SMBIOS=y and either backend dependency =m. Update the comment accordingly.
Cc: Mario Limonciello <[email protected]> Cc: Andy Shevchenko <[email protected]> Signed-off-by: Darren Hart (VMware) <[email protected]> --- Linus, just a heads up on this. Unlikely you would encounter this in your builds, but just in case, I wanted you to know we (0-day) caught it and are verifying the fix. drivers/platform/x86/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index e55b008..eef5eef 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -106,13 +106,13 @@ config ASUS_LAPTOP If you have an ACPI-compatible ASUS laptop, say Y or M here. # -# If the DELL_SMBIOS_SMM feature is enabled, the DELL_SMBIOS driver -# becomes dependent on the DCDBAS driver. The "depends" line prevents a -# configuration where DELL_SMBIOS=y while DCDBAS=m. +# The DELL_SMBIOS driver depends on ACPI_WMI and/or DCDBAS if those +# backends are selected. The "depends" line prevents a configuration +# where DELL_SMBIOS=y while either of those dependencies =m. # config DELL_SMBIOS tristate "Dell SMBIOS driver" - depends on DCDBAS || DCDBAS=n + depends on (DCDBAS || DCDBAS=n) && (ACPI_WMI || ACPI_WMI=n) ---help--- This provides support for the Dell SMBIOS calling interface. If you have a Dell computer you should enable this option. -- 2.9.3 -- Darren Hart VMware Open Source Technology Center
