projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
arch
/
mips
/
include
/
asm
/
mach-loongson
/
machine.h
diff --git
a/arch/mips/include/asm/mach-loongson/machine.h
b/arch/mips/include/asm/mach-loongson/machine.h
index
228e378
..
cb2b602
100644
(file)
--- a/
arch/mips/include/asm/mach-loongson/machine.h
+++ b/
arch/mips/include/asm/mach-loongson/machine.h
@@
-26,7
+26,7
@@
#ifdef CONFIG_LOONGSON_MACH3X
-#define LOONGSON_MACHTYPE MACH_L
EMOTE_A1101
+#define LOONGSON_MACHTYPE MACH_L
OONGSON_GENERIC
#endif /* CONFIG_LOONGSON_MACH3X */