diff options
-rw-r--r-- | MAINTAINERS | 6 | ||||
-rw-r--r-- | arch/i386/kernel/cpu/cyrix.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 465e083237a7..0ad8803a0c75 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3593,6 +3593,12 @@ M: ysato@users.sourceforge.jp | |||
3593 | W: http://uclinux-h8.sourceforge.jp/ | 3593 | W: http://uclinux-h8.sourceforge.jp/ |
3594 | S: Supported | 3594 | S: Supported |
3595 | 3595 | ||
3596 | UFS FILESYSTEM | ||
3597 | P: Evgeniy Dushistov | ||
3598 | M: dushistov@mail.ru | ||
3599 | L: linux-kernel@vger.kernel.org | ||
3600 | S: Maintained | ||
3601 | |||
3596 | USB DIAMOND RIO500 DRIVER | 3602 | USB DIAMOND RIO500 DRIVER |
3597 | P: Cesar Miquel | 3603 | P: Cesar Miquel |
3598 | M: miquel@df.uba.ar | 3604 | M: miquel@df.uba.ar |
diff --git a/arch/i386/kernel/cpu/cyrix.c b/arch/i386/kernel/cpu/cyrix.c index abcff92f994c..c0c3b59de32c 100644 --- a/arch/i386/kernel/cpu/cyrix.c +++ b/arch/i386/kernel/cpu/cyrix.c | |||
@@ -173,7 +173,7 @@ static void __cpuinit geode_configure(void) | |||
173 | ccr4 = getCx86(CX86_CCR4); | 173 | ccr4 = getCx86(CX86_CCR4); |
174 | ccr4 |= 0x38; /* FPU fast, DTE cache, Mem bypass */ | 174 | ccr4 |= 0x38; /* FPU fast, DTE cache, Mem bypass */ |
175 | 175 | ||
176 | setCx86(CX86_CCR4, ccr4); | 176 | setCx86(CX86_CCR3, ccr3); |
177 | 177 | ||
178 | set_cx86_memwb(); | 178 | set_cx86_memwb(); |
179 | set_cx86_reorder(); | 179 | set_cx86_reorder(); |