summaryrefslogtreecommitdiffstats
path: root/arch/tile/kernel/usb.c
diff options
context:
space:
mode:
authorThomas Gleixner2015-10-13 19:00:14 +0200
committerThomas Gleixner2015-10-13 19:00:14 +0200
commite50226b4b86755e65aef2129e94d952fee3df722 (patch)
treed4dd925fc7f5c6fe46b647c8027911190595f014 /arch/tile/kernel/usb.c
parentgenirq: Add flag to force mask in disable_irq[_nosync]() (diff)
parentLinux 4.3-rc5 (diff)
downloadkernel-qcow2-linux-e50226b4b86755e65aef2129e94d952fee3df722.tar.gz
kernel-qcow2-linux-e50226b4b86755e65aef2129e94d952fee3df722.tar.xz
kernel-qcow2-linux-e50226b4b86755e65aef2129e94d952fee3df722.zip
Merge branch 'linus' into irq/core
Bring in upstream updates for patches which depend on them
Diffstat (limited to 'arch/tile/kernel/usb.c')
-rw-r--r--arch/tile/kernel/usb.c1
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);