diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-20 02:57:51 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-20 02:57:51 +0100 |
| commit | 5be95b7e24bde4d93ff1bff5911b303043753168 (patch) | |
| tree | 00ccba63052e5f9b5adbf13e48f3fdbcab77a48c /arch/hexagon/include/asm/io.h | |
| parent | Merge tag 'cris-changes-for-3.19' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | Hexagon: fix signal delivery for debug traps (diff) | |
| download | linux-5be95b7e24bde4d93ff1bff5911b303043753168.tar.xz linux-5be95b7e24bde4d93ff1bff5911b303043753168.zip | |
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/include/asm/io.h')
| -rw-r--r-- | arch/hexagon/include/asm/io.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/hexagon/include/asm/io.h b/arch/hexagon/include/asm/io.h index 70298996e9b2..66f5e9a61efc 100644 --- a/arch/hexagon/include/asm/io.h +++ b/arch/hexagon/include/asm/io.h @@ -24,14 +24,9 @@ #ifdef __KERNEL__ #include <linux/types.h> -#include <linux/delay.h> -#include <linux/vmalloc.h> -#include <asm/string.h> -#include <asm/mem-layout.h> #include <asm/iomap.h> #include <asm/page.h> #include <asm/cacheflush.h> -#include <asm/tlbflush.h> /* * We don't have PCI yet. |