diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-10-06 02:36:38 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-10-06 02:36:38 +0200 |
commit | 7b415285ae96f5bfa0fa95d3227c6900c4ff151d (patch) | |
tree | feb5198f57bfb5b58aca24ddc76a313236f94512 /arch/tile/kernel/usb.c | |
parent | Input: turbografx - store object in correct index (diff) | |
parent | Linux 4.3-rc4 (diff) | |
download | linux-7b415285ae96f5bfa0fa95d3227c6900c4ff151d.tar.xz linux-7b415285ae96f5bfa0fa95d3227c6900c4ff151d.zip |
Merge tag 'v4.3-rc4' into next
Merge with mainline to sync up with changes to parkbd driver.
Diffstat (limited to 'arch/tile/kernel/usb.c')
-rw-r--r-- | arch/tile/kernel/usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/tile/kernel/usb.c b/arch/tile/kernel/usb.c index f0da5a237e94..9f1e05e12255 100644 --- a/arch/tile/kernel/usb.c +++ b/arch/tile/kernel/usb.c @@ -22,6 +22,7 @@ #include <linux/platform_device.h> #include <linux/usb/tilegx.h> #include <linux/init.h> +#include <linux/module.h> #include <linux/types.h> static u64 ehci_dmamask = DMA_BIT_MASK(32); |