Browse Source

platform/x86: dell-smbios: Auto-select as needed

Dell-smbios is a helper module, it serves no purpose on its own, so
do not present it as an option to the user. Instead, select it
automatically whenever a driver which needs it is selected.

Also select DCDBAS as needed, instead of depending on it, so that
the Dell driver options are always visible.

As a clean-up, I removed the "default n" statements as they are not
needed (n is the default default.)

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Michał Kępień <kernel@kempniu.pl>
Cc: Pali Rohár <pali.rohar@gmail.com>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Jean Delvare 8 years ago
parent
commit
9893ae8606
1 changed files with 4 additions and 6 deletions
  1. 4 6
      drivers/platform/x86/Kconfig

+ 4 - 6
drivers/platform/x86/Kconfig

@@ -92,9 +92,8 @@ config ASUS_LAPTOP
 	  If you have an ACPI-compatible ASUS laptop, say Y or M here.
 	  If you have an ACPI-compatible ASUS laptop, say Y or M here.
 
 
 config DELL_SMBIOS
 config DELL_SMBIOS
-	tristate "Dell SMBIOS Support"
-	depends on DCDBAS
-	default n
+	tristate
+	select DCDBAS
 	---help---
 	---help---
 	This module provides common functions for kernel modules using
 	This module provides common functions for kernel modules using
 	Dell SMBIOS.
 	Dell SMBIOS.
@@ -103,16 +102,15 @@ config DELL_SMBIOS
 
 
 config DELL_LAPTOP
 config DELL_LAPTOP
 	tristate "Dell Laptop Extras"
 	tristate "Dell Laptop Extras"
-	depends on DELL_SMBIOS
 	depends on DMI
 	depends on DMI
 	depends on BACKLIGHT_CLASS_DEVICE
 	depends on BACKLIGHT_CLASS_DEVICE
 	depends on ACPI_VIDEO || ACPI_VIDEO = n
 	depends on ACPI_VIDEO || ACPI_VIDEO = n
 	depends on RFKILL || RFKILL = n
 	depends on RFKILL || RFKILL = n
 	depends on SERIO_I8042
 	depends on SERIO_I8042
+	select DELL_SMBIOS
 	select POWER_SUPPLY
 	select POWER_SUPPLY
 	select LEDS_CLASS
 	select LEDS_CLASS
 	select NEW_LEDS
 	select NEW_LEDS
-	default n
 	---help---
 	---help---
 	This driver adds support for rfkill and backlight control to Dell
 	This driver adds support for rfkill and backlight control to Dell
 	laptops (except for some models covered by the Compal driver).
 	laptops (except for some models covered by the Compal driver).
@@ -123,7 +121,7 @@ config DELL_WMI
 	depends on DMI
 	depends on DMI
 	depends on INPUT
 	depends on INPUT
 	depends on ACPI_VIDEO || ACPI_VIDEO = n
 	depends on ACPI_VIDEO || ACPI_VIDEO = n
-	depends on DELL_SMBIOS
+	select DELL_SMBIOS
 	select INPUT_SPARSEKMAP
 	select INPUT_SPARSEKMAP
 	---help---
 	---help---
 	  Say Y here if you want to support WMI-based hotkeys on Dell laptops.
 	  Say Y here if you want to support WMI-based hotkeys on Dell laptops.