diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:29:41 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:30:32 -0500 |
| commit | c1f3ee120bb61045b1c0a3ead620d1d65af47130 (patch) | |
| tree | 908430bf2b47fe8e96ac623ae7ab6dd5698d0938 /include/asm-mips/pmc-sierra | |
| parent | e619a75ff6201b567a539e787aa9af9bc63a3187 (diff) | |
| parent | 9135f1901ee6449dfe338adf6e40e9c2025b8150 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-mips/pmc-sierra')
| -rw-r--r-- | include/asm-mips/pmc-sierra/msp71xx/msp_regs.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-mips/pmc-sierra/msp71xx/msp_regs.h b/include/asm-mips/pmc-sierra/msp71xx/msp_regs.h index 0b56f55206c6..603eb737b4a8 100644 --- a/include/asm-mips/pmc-sierra/msp71xx/msp_regs.h +++ b/include/asm-mips/pmc-sierra/msp71xx/msp_regs.h | |||
| @@ -585,11 +585,7 @@ | |||
| 585 | * UART defines * | 585 | * UART defines * |
| 586 | *************************************************************************** | 586 | *************************************************************************** |
| 587 | */ | 587 | */ |
| 588 | #ifndef CONFIG_MSP_FPGA | ||
| 589 | #define MSP_BASE_BAUD 25000000 | 588 | #define MSP_BASE_BAUD 25000000 |
| 590 | #else | ||
| 591 | #define MSP_BASE_BAUD 6000000 | ||
| 592 | #endif | ||
| 593 | #define MSP_UART_REG_LEN 0x20 | 589 | #define MSP_UART_REG_LEN 0x20 |
| 594 | 590 | ||
| 595 | /* | 591 | /* |