diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 16:04:58 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 16:04:58 (GMT) |
| commit | 514b1923e1549162f1597f81113c0e5b72aed691 (patch) | |
| tree | b804bc621d81e022593584fc608df563c8c6b8ca /arch/hexagon/include/asm/spinlock_types.h | |
| parent | 6f73b3629f774c6cba589b15fd095112b25ca923 (diff) | |
| parent | 5042ab91c4272e158748180ae70a2e097f9e90e3 (diff) | |
| download | linux-fsl-qoriq-514b1923e1549162f1597f81113c0e5b72aed691.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel
Pull Hexagon architecture changes from Richard Kuo:
"These are mostly cleanups and feedback remaining from the original
upstreaming."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
various Kconfig cleanup and old platform build code removal
hexagon/mm/vm_fault.c: Port OOM changes to do_page_fault
arch/hexagon/kernel/dma.c: make function static
Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h
Hexagon: Use resource_size function
Diffstat (limited to 'arch/hexagon/include/asm/spinlock_types.h')
| -rw-r--r-- | arch/hexagon/include/asm/spinlock_types.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/hexagon/include/asm/spinlock_types.h b/arch/hexagon/include/asm/spinlock_types.h index 5e937af..99b5a75 100644 --- a/arch/hexagon/include/asm/spinlock_types.h +++ b/arch/hexagon/include/asm/spinlock_types.h @@ -21,8 +21,6 @@ #ifndef _ASM_SPINLOCK_TYPES_H #define _ASM_SPINLOCK_TYPES_H -#include <linux/version.h> - #ifndef __LINUX_SPINLOCK_TYPES_H # error "please don't include this file directly" #endif |