From c9cb5f7346eaae6cdbed439332a0a21100d67ec9 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 27 Oct 2019 15:09:46 +0000
Subject: [PATCH] debian/config: Move all drivers/platform/x86 symbols to
 kernelarch-x86

These Kconfig symbols depend on X86 so it doesn't make sense to set
them in the top-level config.
---
 debian/config/config                | 22 ----------------------
 debian/config/kernelarch-x86/config | 10 ++++++++++
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/debian/config/config b/debian/config/config
index 32b45846ec4e..31740c19345a 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -4341,28 +4341,6 @@ CONFIG_YENTA_TOSHIBA=y
 ##
 # CONFIG_GOLDFISH is not set
 
-##
-## file: drivers/platform/x86/Kconfig
-##
-CONFIG_ACER_WIRELESS=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_FUJITSU_LAPTOP=m
-CONFIG_HP_WMI=m
-CONFIG_LG_LAPTOP=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-CONFIG_SURFACE3_WMI=m
-CONFIG_INTEL_WMI_THUNDERBOLT=m
-CONFIG_PEAQ_WMI=m
-CONFIG_TOSHIBA_WMI=m
-# CONFIG_SAMSUNG_LAPTOP is not set
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_INTEL_TURBO_MAX_3=y
-CONFIG_I2C_MULTI_INSTANTIATE=m
-CONFIG_HUAWEI_WMI=m
-
 ##
 ## file: drivers/pnp/Kconfig
 ##
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index cbf9193f3678..af2065feb565 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1371,6 +1371,7 @@ CONFIG_CROS_KBD_LED_BACKLIGHT=m
 ##
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
+CONFIG_ACER_WIRELESS=m
 CONFIG_ACERHDF=m
 CONFIG_ALIENWARE_WMI=m
 CONFIG_ASUS_LAPTOP=m
@@ -1392,12 +1393,14 @@ CONFIG_GPD_POCKET_FAN=m
 CONFIG_HP_ACCEL=m
 CONFIG_HP_WIRELESS=m
 CONFIG_HP_WMI=m
+CONFIG_LG_LAPTOP=m
 CONFIG_MSI_LAPTOP=m
 CONFIG_PANASONIC_LAPTOP=m
 CONFIG_COMPAL_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_SURFACE3_WMI=m
 CONFIG_THINKPAD_ACPI=m
 CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
 # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
@@ -1413,11 +1416,14 @@ CONFIG_ASUS_NB_WMI=m
 CONFIG_EEEPC_WMI=m
 CONFIG_ASUS_WIRELESS=m
 CONFIG_ACPI_WMI=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_MSI_WMI=m
+CONFIG_PEAQ_WMI=m
 CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_TOSHIBA_HAPS=m
+CONFIG_TOSHIBA_WMI=m
 CONFIG_ACPI_CMPC=m
 CONFIG_INTEL_CHT_INT33FE=m
 CONFIG_INTEL_INT0002_VGPIO=m
@@ -1433,7 +1439,11 @@ CONFIG_INTEL_RST=m
 CONFIG_INTEL_SMARTCONNECT=m
 CONFIG_INTEL_PMC_IPC=m
 CONFIG_SURFACE_PRO3_BUTTON=m
+CONFIG_SURFACE_3_BUTTON=m
+CONFIG_INTEL_TURBO_MAX_3=y
+CONFIG_I2C_MULTI_INSTANTIATE=m
 CONFIG_INTEL_ATOMISP2_PM=m
+CONFIG_HUAWEI_WMI=m
 
 ##
 ## file: drivers/pnp/Kconfig