Skip to content

Commit 4f6c131

Browse files
andy-shevjwrdegoede
authored andcommitted
platform/x86/intel: Remove X86_PLATFORM_DRIVERS_INTEL
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>
1 parent c449927 commit 4f6c131

2 files changed

Lines changed: 1 addition & 16 deletions

File tree

drivers/platform/x86/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o
6868
obj-$(CONFIG_THINKPAD_LMI) += think-lmi.o
6969

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

7373
# MSI
7474
obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o

drivers/platform/x86/intel/Kconfig

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,6 @@
33
# Intel x86 Platform Specific Drivers
44
#
55

6-
menuconfig X86_PLATFORM_DRIVERS_INTEL
7-
bool "Intel x86 Platform Specific Device Drivers"
8-
default y
9-
help
10-
Say Y here to get to see options for device drivers for
11-
various Intel x86 platforms, including vendor-specific
12-
drivers. This option alone does not add any kernel code.
13-
14-
If you say N, all options in this submenu will be skipped
15-
and disabled.
16-
17-
if X86_PLATFORM_DRIVERS_INTEL
18-
196
source "drivers/platform/x86/intel/atomisp2/Kconfig"
207
source "drivers/platform/x86/intel/int1092/Kconfig"
218
source "drivers/platform/x86/intel/int33fe/Kconfig"
@@ -183,5 +170,3 @@ config INTEL_UNCORE_FREQ_CONTROL
183170

184171
To compile this driver as a module, choose M here: the module
185172
will be called intel-uncore-frequency.
186-
187-
endif # X86_PLATFORM_DRIVERS_INTEL

0 commit comments

Comments
 (0)