Commit 31481401 authored by Linus Torvalds's avatar Linus Torvalds

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
parents c3bebc71 ae72758f
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#define _ASM_C6X_CACHE_H #define _ASM_C6X_CACHE_H
#include <linux/irqflags.h> #include <linux/irqflags.h>
#include <linux/init.h>
/* /*
* Cache line size * Cache line size
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment