diff options
author | Darren Hart <dvhart@infradead.org> | 2018-03-10 19:12:16 -0500 |
---|---|---|
committer | Darren Hart (VMware) <dvhart@infradead.org> | 2018-03-12 16:31:38 -0400 |
commit | 4716007c23abeb0e42015786794539454aff487b (patch) | |
tree | d4c4cf257ee75075656d525c9ae41ddf64c0b18f | |
parent | cc69c88fbeb915447b87e5179378d899d1f61554 (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/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index e55b0089c06f..1868aab0282a 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 | # |
113 | config DELL_SMBIOS | 113 | config 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. |