diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-14 15:14:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-14 15:14:36 +0100 |
| commit | 6fbefa4e81780e7e372c19e31cd33cc2456b230f (patch) | |
| tree | 79178a0b363a4673ff0c859b25d0d20d890fc234 /drivers/usb | |
| parent | 9c513523039dc8ee83f8f527acdcbc7a792d83bc (diff) | |
| parent | e02cb91d4644dfff593146f89e70d2008cc6ac16 (diff) | |
| download | linux-next-6fbefa4e81780e7e372c19e31cd33cc2456b230f.tar.gz linux-next-6fbefa4e81780e7e372c19e31cd33cc2456b230f.zip | |
Merge branch 'headers' of git://git.infradead.org/users/willy/pagecache.git
# Conflicts:
# drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
# net/ceph/osd_client.c
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/core/hcd.c | 1 | ||||
| -rw-r--r-- | drivers/usb/typec/mux/it5205.c | 1 | ||||
| -rw-r--r-- | drivers/usb/typec/wusb3801.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 8e8a5f59b319..a865a15ea386 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -18,6 +18,7 @@ #include <linux/completion.h> #include <linux/utsname.h> #include <linux/mm.h> +#include <linux/highmem.h> #include <asm/io.h> #include <linux/device.h> #include <linux/dma-mapping.h> diff --git a/drivers/usb/typec/mux/it5205.c b/drivers/usb/typec/mux/it5205.c index 2ab2ba6a3cbd..c6bdf74cb657 100644 --- a/drivers/usb/typec/mux/it5205.c +++ b/drivers/usb/typec/mux/it5205.c @@ -10,6 +10,7 @@ #include <linux/delay.h> #include <linux/i2c.h> +#include <linux/interrupt.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/of_platform.h> diff --git a/drivers/usb/typec/wusb3801.c b/drivers/usb/typec/wusb3801.c index 6062875fb04a..3ca66138f7be 100644 --- a/drivers/usb/typec/wusb3801.c +++ b/drivers/usb/typec/wusb3801.c @@ -6,6 +6,7 @@ */ #include <linux/i2c.h> +#include <linux/interrupt.h> #include <linux/module.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h> |