diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-07 22:58:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-07 22:58:49 +0200 |
| commit | 37949075ab628e8ef36a877108c2d95b13221cc5 (patch) | |
| tree | a4b26ff06ed3680384f66e0aba08fd4945d11311 /arch/openrisc/include/asm | |
| parent | Merge tag 'powerpc-4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/p... (diff) | |
| parent | openrisc: defconfig: Cleanup from old Kconfig options (diff) | |
| download | linux-37949075ab628e8ef36a877108c2d95b13221cc5.tar.xz linux-37949075ab628e8ef36a877108c2d95b13221cc5.zip | |
Merge tag 'openrisc-for-linus' of git://github.com/openrisc/linux
Pull OpenRISC updates from Stafford Horne:
"Openrisc fixes for this 4.13 merge window, there is not really much
here:
- include cleanups, one with should reduce build time slightly
- switch to new toolchain to new (>2 year old) toolchain prefix"
* tag 'openrisc-for-linus' of git://github.com/openrisc/linux:
openrisc: defconfig: Cleanup from old Kconfig options
openrisc: explicitly include linux/bug.h in asm/fixmap.h
openrisc: Switch to use export.h instead of module.h
openrisc: Change toolchain from or32- to or1k-
Diffstat (limited to 'arch/openrisc/include/asm')
| -rw-r--r-- | arch/openrisc/include/asm/fixmap.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/openrisc/include/asm/fixmap.h b/arch/openrisc/include/asm/fixmap.h index 52733416c1f3..5a0159546f9e 100644 --- a/arch/openrisc/include/asm/fixmap.h +++ b/arch/openrisc/include/asm/fixmap.h @@ -27,6 +27,7 @@ #define FIXADDR_TOP ((unsigned long) (-2*PAGE_SIZE)) #include <linux/kernel.h> +#include <linux/bug.h> #include <asm/page.h> /* |