git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
[sfrench/cifs-2.6.git]
/
arch
/
sh
/
include
/
asm
/
machvec.h
diff --git
a/arch/sh/include/asm/machvec.h
b/arch/sh/include/asm/machvec.h
index 84dd37761f563ee56aef820e97d6d1cc844f0936..9c30955630ffb8882064a53a54c76e9d810af659 100644
(file)
--- a/
arch/sh/include/asm/machvec.h
+++ b/
arch/sh/include/asm/machvec.h
@@
-12,7
+12,7
@@
#include <linux/types.h>
#include <linux/time.h>
-#include <
asm
/machtypes.h>
+#include <
generated
/machtypes.h>
struct sh_machine_vector {
void (*mv_setup)(char **cmdline_p);