aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@infradead.org>2018-03-10 19:12:16 -0500
committerDarren Hart (VMware) <dvhart@infradead.org>2018-03-14 14:05:43 -0400
commit75073a64a98cecf4b2a81567b31b5a52dd3518bc (patch)
treeb6d7d8341d3a94501f0faf6e03e66465c28a9c3f
parent32d7b19bad9695c4c9026b0ceb3a384561ddee70 (diff)
platform/x86: dell-smbios: Resolve dependency error on ACPI_WMI
Similarly to DCDBAS for DELL_SMBIOS_SMM, if DELL_SMBIOS_WMI is enabled, DELL_SMBIOS becomes dependent on ACPI_WMI. Update the depends lines to prevent a configuration where DELL_SMBIOS=y and either backend dependency =m. Update the comment accordingly. Cc: Mario Limonciello <mario.limonciello@dell.com> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
-rw-r--r--drivers/platform/x86/Kconfig7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index d10ffe51da24..51ebc5a6053f 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -106,13 +106,14 @@ config ASUS_LAPTOP
106 If you have an ACPI-compatible ASUS laptop, say Y or M here. 106 If you have an ACPI-compatible ASUS laptop, say Y or M here.
107 107
108# 108#
109# If the DELL_SMBIOS_SMM feature is enabled, the DELL_SMBIOS driver 109# The DELL_SMBIOS driver depends on ACPI_WMI and/or DCDBAS if those
110# becomes dependent on the DCDBAS driver. The "depends" line prevents a 110# backends are selected. The "depends" line prevents a configuration
111# configuration where DELL_SMBIOS=y while DCDBAS=m. 111# where DELL_SMBIOS=y while either of those dependencies =m.
112# 112#
113config DELL_SMBIOS 113config DELL_SMBIOS
114 tristate "Dell SMBIOS driver" 114 tristate "Dell SMBIOS driver"
115 depends on DCDBAS || DCDBAS=n 115 depends on DCDBAS || DCDBAS=n
116 depends on ACPI_WMI || ACPI_WMI=n
116 ---help--- 117 ---help---
117 This provides support for the Dell SMBIOS calling interface. 118 This provides support for the Dell SMBIOS calling interface.
118 If you have a Dell computer you should enable this option. 119 If you have a Dell computer you should enable this option.