diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-07 18:52:46 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-07 18:52:46 +0100 |
| commit | 314814017c3525b7f4796056f779f3e67e08d396 (patch) | |
| tree | ba4a7d939c30742e07b9c84832d794a0ff2eda52 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | c6x: fix build failure caused by cache.h (diff) | |
| download | linux-314814017c3525b7f4796056f779f3e67e08d396.tar.xz linux-314814017c3525b7f4796056f779f3e67e08d396.zip | |
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
Pull c6x build fix from Mark Salter:
"Build fix for c6x"
* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
c6x: fix build failure caused by cache.h
| -rw-r--r-- | arch/c6x/include/asm/cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/c6x/include/asm/cache.h b/arch/c6x/include/asm/cache.h index 09c5a0f5f4d1..86648c083bb4 100644 --- a/arch/c6x/include/asm/cache.h +++ b/arch/c6x/include/asm/cache.h @@ -12,6 +12,7 @@ #define _ASM_C6X_CACHE_H #include <linux/irqflags.h> +#include <linux/init.h> /* * Cache line size |