diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /arch/cris/arch-v10/Kconfig | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'arch/cris/arch-v10/Kconfig')
| -rw-r--r-- | arch/cris/arch-v10/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/Kconfig b/arch/cris/arch-v10/Kconfig index 44eb1b9accb3..c7ea9efd0104 100644 --- a/arch/cris/arch-v10/Kconfig +++ b/arch/cris/arch-v10/Kconfig | |||
| @@ -323,7 +323,7 @@ config ETRAX_DEF_R_WAITSTATES | |||
| 323 | depends on ETRAX_ARCH_V10 | 323 | depends on ETRAX_ARCH_V10 |
| 324 | default "95a6" | 324 | default "95a6" |
| 325 | help | 325 | help |
| 326 | Waitstates for SRAM, Flash and peripherials (not DRAM). 95f8 is a | 326 | Waitstates for SRAM, Flash and peripherals (not DRAM). 95f8 is a |
| 327 | good choice for most Axis products... | 327 | good choice for most Axis products... |
| 328 | 328 | ||
| 329 | config ETRAX_DEF_R_BUS_CONFIG | 329 | config ETRAX_DEF_R_BUS_CONFIG |