diff --git a/[refs] b/[refs] index 637fa17afdc0..00a16449947c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c746edb35c9800e2ad9f64b5d96d0732c42b74b +refs/heads/master: 2d47c58efadd33b8399f3f440b7e9cf93692f262 diff --git a/trunk/include/asm-mips/pmc-sierra/msp71xx/msp_regs.h b/trunk/include/asm-mips/pmc-sierra/msp71xx/msp_regs.h index 0b56f55206c6..603eb737b4a8 100644 --- a/trunk/include/asm-mips/pmc-sierra/msp71xx/msp_regs.h +++ b/trunk/include/asm-mips/pmc-sierra/msp71xx/msp_regs.h @@ -585,11 +585,7 @@ * UART defines * *************************************************************************** */ -#ifndef CONFIG_MSP_FPGA #define MSP_BASE_BAUD 25000000 -#else -#define MSP_BASE_BAUD 6000000 -#endif #define MSP_UART_REG_LEN 0x20 /*