summaryrefslogtreecommitdiff
path: root/drivers/usb/misc
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-10-27 08:33:01 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-10-27 08:33:01 +0100
commitd518ec2cbcac1c1175563a115f5024eeb6b4cd8d (patch)
treec463798d8b6c7c7c8372413bf99c1a1a02ef6cf0 /drivers/usb/misc
parentbe83d83664e9f6fa035e96fb9187f9e7898659e4 (diff)
parentdcb6fa37fd7bc9c3d2b066329b0d27dedf8becaa (diff)
downloadlinux-next-d518ec2cbcac1c1175563a115f5024eeb6b4cd8d.tar.gz
linux-next-d518ec2cbcac1c1175563a115f5024eeb6b4cd8d.zip
Merge 6.18-rc3 into usb-next
We need the USB fixes in here as well to build on top of. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/misc')
-rw-r--r--drivers/usb/misc/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index 09ac6f1c985f..0b56b773dbdf 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -182,6 +182,7 @@ config USB_LJCA
config USB_USBIO
tristate "Intel USBIO Bridge support"
depends on USB && ACPI
+ depends on X86 || COMPILE_TEST
select AUXILIARY_BUS
help
This adds support for Intel USBIO drivers.