diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 20:33:14 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 20:33:14 (GMT) |
| commit | da206c9e68cb93fcab43592d46276c02889c1250 (patch) | |
| tree | 21264cc26fa0322d668b398808f10bd93558d25f /arch/i386/Kconfig.cpu | |
| parent | 916d15445f4ad2a9018e5451760734f36083be77 (diff) | |
| parent | 2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (diff) | |
| download | linux-fsl-qoriq-da206c9e68cb93fcab43592d46276c02889c1250.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
typo fixes
Clean up 'inline is not at beginning' warnings for usb storage
Storage class should be first
i386: Trivial typo fixes
ixj: make ixj_set_tone_off() static
spelling fixes
fix paniced->panicked typos
Spelling fixes for Documentation/atomic_ops.txt
move acknowledgment for Mark Adler to CREDITS
remove the bouncing email address of David Campbell
Diffstat (limited to 'arch/i386/Kconfig.cpu')
| -rw-r--r-- | arch/i386/Kconfig.cpu | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/Kconfig.cpu b/arch/i386/Kconfig.cpu index eb13048..21c9a4e 100644 --- a/arch/i386/Kconfig.cpu +++ b/arch/i386/Kconfig.cpu @@ -41,7 +41,7 @@ config M386 - "GeodeGX1" for Geode GX1 (Cyrix MediaGX). - "Geode GX/LX" For AMD Geode GX and LX processors. - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3. - - "VIA C3-2 for VIA C3-2 "Nehemiah" (model 9 and above). + - "VIA C3-2" for VIA C3-2 "Nehemiah" (model 9 and above). If you don't know what to do, choose "386". |