diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-07 12:52:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-07 12:52:46 -0500 |
| commit | 314814017c3525b7f4796056f779f3e67e08d396 (patch) | |
| tree | ba4a7d939c30742e07b9c84832d794a0ff2eda52 | |
| parent | c3bebc71c4bcdafa24b506adf0c1de3c1f77e2e0 (diff) | |
| parent | ae72758f1dd93bd367dc7719702f24a9bfb3bad9 (diff) | |
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 @@ | |||
| 12 | #define _ASM_C6X_CACHE_H | 12 | #define _ASM_C6X_CACHE_H |
| 13 | 13 | ||
| 14 | #include <linux/irqflags.h> | 14 | #include <linux/irqflags.h> |
| 15 | #include <linux/init.h> | ||
| 15 | 16 | ||
| 16 | /* | 17 | /* |
| 17 | * Cache line size | 18 | * Cache line size |