diff options
| author |  Hans de Goede <hdegoede@redhat.com>
| 2023-07-31 16:05:44 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com>
| 2023-07-31 16:05:44 +0200 |
| commit | 17ffe3a0fded309449e8bf201ad70358f3d52772 (patch) | |
| tree | f3b5e5abc181dd088347e4b374851a8787600489 /drivers/platform/x86/Makefile | |
| parent | platform/x86: hp-bioscfg: fix error reporting in hp_add_other_attributes() (diff) | |
| parent | platform/x86/siemens: simatic-ipc-batt: add support for module BX-59A (diff) | |
| download | linux-17ffe3a0fded309449e8bf201ad70358f3d52772.tar.gz linux-17ffe3a0fded309449e8bf201ad70358f3d52772.tar.bz2 linux-17ffe3a0fded309449e8bf201ad70358f3d52772.zip | |
Merge tag 'ib-pdx86-simatic-v6.6-2' into review-hans
Immutable branch between pdx86 simatic branch and LED due for the v6.6 merge window
ib-pdx86-simatic-v6.6-2: v6.5-rc1 + ib-pdx86-simatic-v6.6 +
more recent pdx86 simatic-ipc patches for merging into
the LED subsystem for v6.6.
Diffstat (limited to 'drivers/platform/x86/Makefile')
| -rw-r--r-- | drivers/platform/x86/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index a5f81dc8ba4e..b457de5abf7d 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -131,11 +131,7 @@ obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += intel_scu_ipcutil.o obj-$(CONFIG_X86_INTEL_LPSS) += pmc_atom.o # Siemens Simatic Industrial PCs -obj-$(CONFIG_SIEMENS_SIMATIC_IPC) += simatic-ipc.o -obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT) += simatic-ipc-batt.o -obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE) += simatic-ipc-batt-apollolake.o -obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE) += simatic-ipc-batt-elkhartlake.o -obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT_F7188X) += simatic-ipc-batt-f7188x.o +obj-$(CONFIG_SIEMENS_SIMATIC_IPC) += siemens/ # Winmate obj-$(CONFIG_WINMATE_FM07_KEYS) += winmate-fm07-keys.o |