diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-19 17:57:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-19 17:57:51 -0800 |
| commit | 5be95b7e24bde4d93ff1bff5911b303043753168 (patch) | |
| tree | 00ccba63052e5f9b5adbf13e48f3fdbcab77a48c /arch/hexagon/kernel/setup.c | |
| parent | 971d9e07e18fa3684e7fbc932f01aa2a0682f232 (diff) | |
| parent | 8914d7e857807e1e60975000cba3750c9b2643e8 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel
Pull arch/hexagon updates from Richard Kuo:
"Build cleanup and a few misc fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
Hexagon: fix signal delivery for debug traps
Hexagon: set ARCH_DMA_MINALIGN
Hexagon: fix alignment of init_task in RW_DATA_SECTION
hexagon: Fix build failures in linux-next
Diffstat (limited to 'arch/hexagon/kernel/setup.c')
| -rw-r--r-- | arch/hexagon/kernel/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/hexagon/kernel/setup.c b/arch/hexagon/kernel/setup.c index 0e7c1dbb37b2..6981949f5df3 100644 --- a/arch/hexagon/kernel/setup.c +++ b/arch/hexagon/kernel/setup.c @@ -19,6 +19,7 @@ */ #include <linux/init.h> +#include <linux/delay.h> #include <linux/bootmem.h> #include <linux/mmzone.h> #include <linux/mm.h> |