summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds2015-09-28 18:27:18 +0200
committerLinus Torvalds2015-09-28 18:27:18 +0200
commit3225031fbeb1e32b269a82eccd815128267a4bfe (patch)
tree5fa6d7c6cd7bdb30e35b04e87e913cc4a128093b
parentMerge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff)
parenttile: fix build failure (diff)
downloadkernel-qcow2-linux-3225031fbeb1e32b269a82eccd815128267a4bfe.tar.gz
kernel-qcow2-linux-3225031fbeb1e32b269a82eccd815128267a4bfe.tar.xz
kernel-qcow2-linux-3225031fbeb1e32b269a82eccd815128267a4bfe.zip
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile bugfix from Chris Metcalf: "This fixes a bug in 'make allmodconfig'" * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: tile: fix build failure
-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);