diff options
| author | Chris Zankel <chris@zankel.net> | 2014-04-10 01:49:29 +0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-04-10 01:49:29 +0400 |
| commit | e86c4b67feb2c984314eef71314f26cfe39fef36 (patch) | |
| tree | 3c5a7e2216cdcd1d06b8729bf94eba6dc74a7959 /arch/c6x | |
| parent | b3fdfc1b4b641d372e35ced98814289bc60bc5d1 (diff) | |
| parent | 9c602629e34bad88a464e08de08118e80beee0d8 (diff) | |
| download | linux-e86c4b67feb2c984314eef71314f26cfe39fef36.tar.xz | |
Merge tag 'xtensa-for-next-20140406' of git://github.com/jcmvbkbc/linux-xtensa into for_next
Merging from Max' tree.
Xtensa fixes for 3.15:
- add missing cache manipulation symbol exports to fix build failures;
- sort extable at build time;
- clean up sysmem code, support memmap boot parameter;
- add highmem support for cores with non-aliasing caches;
- add DTS for xtfpga on KC705.
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/c6x')
| -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 |