summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-03-07 21:52:46 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-03-07 21:52:46 +0400
commit314814017c3525b7f4796056f779f3e67e08d396 (patch)
treeba4a7d939c30742e07b9c84832d794a0ff2eda52 /arch
parentc3bebc71c4bcdafa24b506adf0c1de3c1f77e2e0 (diff)
parentae72758f1dd93bd367dc7719702f24a9bfb3bad9 (diff)
downloadlinux-314814017c3525b7f4796056f779f3e67e08d396.tar.xz
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
Diffstat (limited to 'arch')
-rw-r--r--arch/c6x/include/asm/cache.h1
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