summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart (VMware) <dvhart@infradead.org>2018-03-06 18:01:04 -0800
committerDarren Hart (VMware) <dvhart@infradead.org>2018-03-09 09:35:46 -0800
commit32d7b19bad9695c4c9026b0ceb3a384561ddee70 (patch)
tree99c6e874c1ee9c2841fdadbbc202078b7d506023
parent329d58b890be8ac9f2c1a72324fd2bed07dd6bce (diff)
downloadlinux-32d7b19bad9695c4c9026b0ceb3a384561ddee70.tar.bz2
platform/x86: dell-smbios: Resolve dependency error on DCDBAS
When the DELL_SMBIOS_SMM backend is enabled, the DELL_SMBIOS symbol depends on DELL_DCDBAS, and we must avoid the situation where DELL_SMBIOS=y and DCDBAS=m. Adding the conditional dependency to DELL_SMBIOS such as: depends !DELL_SMBIOS_SMM || (DCDBAS || DCDBAS=n) results in the Kconfig tooling complaining about a circular dependency, although it appears to work in practice. Avoid the errors by simplifying the dependency and forcing DELL_SMBIOS to be <= DCDBAS if DCDBAS is enabled (thanks to Greg KH for the suggestion). Cc: Mario.Limonciello@dell.com Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
-rw-r--r--drivers/platform/x86/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index a87588a7b070..d10ffe51da24 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -105,8 +105,14 @@ 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.
+#
config DELL_SMBIOS
tristate "Dell SMBIOS driver"
+ depends on DCDBAS || DCDBAS=n
---help---
This provides support for the Dell SMBIOS calling interface.
If you have a Dell computer you should enable this option.