summaryrefslogtreecommitdiffstats
path: root/arch/tile/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-07-02 11:07:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-02 11:07:27 -0700
commita611fb75d0517fce65f588cde94f80bb4052c6b2 (patch)
treee21aee2608eb4546ec3d4528e5461cd8ff23fa82 /arch/tile/kernel
parent75462c8a87ec229e6796df5075318d824df31ead (diff)
parent32e805e7c6a343894c95a3431973e8ddad4aa2cf (diff)
downloadblackbird-op-linux-a611fb75d0517fce65f588cde94f80bb4052c6b2.tar.gz
blackbird-op-linux-a611fb75d0517fce65f588cde94f80bb4052c6b2.zip
Merge tag 'module-misc-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Pull init.h/module.h fragility fixes from Paul Gortmaker: "Fixup various init.h misuses that are fragile wrt code moving to module.h What started as a removal of no longer required include <linux/init.h> due to the earlier __cpuinit and __devinit removal led to the observation that some module specfic support was living in init.h itself, thus preventing the full removal from introducing compile regressions. This series includes a few final fixups needed prior to the relocation of the modular init code from <init.h> to <module.h>. These are things that weren't easily categorized into any of the other previous series categories already requested for pull. That said, each fixup branch (including this one) is independent and there are no ordering constraints. Only the final code relocation (which is NOT in this pull) requires that all my cleanup branches be merged first" * tag 'module-misc-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: tile: add init.h to usb.c to avoid compile failure arm: fix implicit #include <linux/init.h> in entry asm. x86: replace __init_or_module with __init in non-modular vsmp_64.c
Diffstat (limited to 'arch/tile/kernel')
-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 5af8debc6a71..f0da5a237e94 100644
--- a/arch/tile/kernel/usb.c
+++ b/arch/tile/kernel/usb.c
@@ -21,6 +21,7 @@
#include <linux/dma-mapping.h>
#include <linux/platform_device.h>
#include <linux/usb/tilegx.h>
+#include <linux/init.h>
#include <linux/types.h>
static u64 ehci_dmamask = DMA_BIT_MASK(32);
OpenPOWER on IntegriCloud