projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
include
/
asm-m68k
/
setup.h
diff --git
a/include/asm-m68k/setup.h
b/include/asm-m68k/setup.h
index
2a8853c
..
4dfb395
100644
(file)
--- a/
include/asm-m68k/setup.h
+++ b/
include/asm-m68k/setup.h
@@
-248,7
+248,7
@@
extern unsigned long m68k_machtype;
#ifndef __ASSEMBLY__
extern unsigned long m68k_cputype;
extern unsigned long m68k_fputype;
-extern unsigned long m68k_mmutype;
/* Not really used yet */
+extern unsigned long m68k_mmutype;
#ifdef CONFIG_VME
extern unsigned long vme_brdtype;
#endif