platform/x86: intel-vbtn: Move to intel sub-directory

Move intel-vbtn to intel sub-directory to improve readability. Signed-off-by: Kate Hsuan <hpa@redhat.com>
0day-ci · Aug 16, 2021 · e1413deafe75ca70b59d29f73b389fdc0249ce7b · e1413de
1 parent e8e64cd
commit e1413deafe75ca70b59d29f73b389fdc0249ce7b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
@@ -677,19 +677,6 @@ config INTEL_MENLOW
 
 	  If unsure, say N.
 
-config INTEL_VBTN
-	tristate "INTEL VIRTUAL BUTTON"
-	depends on ACPI
-	depends on INPUT
-	depends on I2C
-	select INPUT_SPARSEKMAP
-	help
-	  This driver provides support for the Intel Virtual Button interface.
-	  Some laptops require this driver for power button support.
-
-	  To compile this driver as a module, choose M here: the module will
-	  be called intel_vbtn.
-
 config MSI_LAPTOP
 	tristate "MSI Laptop Extras"
 	depends on ACPI

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
@@ -70,9 +70,7 @@ obj-$(CONFIG_THINKPAD_LMI)	+= think-lmi.o
 
 # Intel
 obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)		+= intel/
-
 obj-$(CONFIG_INTEL_MENLOW)		+= intel_menlow.o
-obj-$(CONFIG_INTEL_VBTN)		+= intel-vbtn.o
 
 # MSI
 obj-$(CONFIG_MSI_LAPTOP)	+= msi-laptop.o

diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
@@ -53,6 +53,19 @@ config INTEL_INT0002_VGPIO
 	  To compile this driver as a module, choose M here: the module will
 	  be called intel_int0002_vgpio.
 
+config INTEL_VBTN
+	tristate "INTEL VIRTUAL BUTTON"
+	depends on ACPI
+	depends on INPUT
+	depends on I2C
+	select INPUT_SPARSEKMAP
+	help
+	  This driver provides support for the Intel Virtual Button interface.
+	  Some laptops require this driver for power button support.
+
+	  To compile this driver as a module, choose M here: the module will
+	  be called intel_vbtn.
+
 config INTEL_OAKTRAIL
 	tristate "Intel Oaktrail Platform Extras"
 	depends on ACPI

diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
@@ -16,6 +16,9 @@ intel_int0002_vgpio-y				:= int0002_vgpio.o
 obj-$(CONFIG_INTEL_INT0002_VGPIO)	+= intel_int0002_vgpio.o
 intel_oaktrail-y					:= oaktrail.o
 obj-$(CONFIG_INTEL_OAKTRAIL)		+= intel_oaktrail.o
+CFLAGS_vbtn.o						:= -I./drivers/platform/x86
+intel-vbtn-y						:= vbtn.o
+obj-$(CONFIG_INTEL_VBTN)		+= intel-vbtn.o
 
 # Intel PMIC / PMC / P-Unit devices
 intel_bxtwc_tmu-y 					:= bxtwc_tmu.o

diff --git a/drivers/platform/x86/intel-vbtn.c → drivers/platform/x86/intel/vbtn.c b/drivers/platform/x86/intel-vbtn.c → drivers/platform/x86/intel/vbtn.c