Skip to content

Commit

Permalink
platform/x86/intel: Remove X86_PLATFORM_DRIVERS_INTEL
Browse files Browse the repository at this point in the history
[ Upstream commit 4f6c131 ]

While introduction of this menu brings a nice view in the configuration tools,
it brought more issues than solves, i.e. it prevents to locate files in the
intel/ subfolder without touching non-related Kconfig dependencies elsewhere.
Drop X86_PLATFORM_DRIVERS_INTEL altogether.

Note, on x86 it's enabled by default and it's quite unlikely anybody wants to
disable all of the modules in this submenu.

Fixes: 8bd836f ("platform/x86: intel_skl_int3472: Move to intel/ subfolder")
Suggested-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20211222194941.76054-1-andriy.shevchenko@linux.intel.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
andy-shev authored and gregkh committed Dec 29, 2021
1 parent 50f27a2 commit 4a34b51
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 16 deletions.
2 changes: 1 addition & 1 deletion drivers/platform/x86/Makefile
Expand Up @@ -67,7 +67,7 @@ obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o
obj-$(CONFIG_THINKPAD_LMI) += think-lmi.o

# Intel
obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL) += intel/
obj-y += intel/

# MSI
obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
Expand Down
15 changes: 0 additions & 15 deletions drivers/platform/x86/intel/Kconfig
Expand Up @@ -3,19 +3,6 @@
# Intel x86 Platform Specific Drivers
#

menuconfig X86_PLATFORM_DRIVERS_INTEL
bool "Intel x86 Platform Specific Device Drivers"
default y
help
Say Y here to get to see options for device drivers for
various Intel x86 platforms, including vendor-specific
drivers. This option alone does not add any kernel code.

If you say N, all options in this submenu will be skipped
and disabled.

if X86_PLATFORM_DRIVERS_INTEL

source "drivers/platform/x86/intel/atomisp2/Kconfig"
source "drivers/platform/x86/intel/int1092/Kconfig"
source "drivers/platform/x86/intel/int33fe/Kconfig"
Expand Down Expand Up @@ -167,5 +154,3 @@ config INTEL_UNCORE_FREQ_CONTROL

To compile this driver as a module, choose M here: the module
will be called intel-uncore-frequency.

endif # X86_PLATFORM_DRIVERS_INTEL

0 comments on commit 4a34b51

Please sign in to comment.