mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-30 00:20:44 +09:00
POST: Fix merge problem
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
parent
429d9571f6
commit
4ce846ec59
@ -137,7 +137,7 @@
|
|||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
<<<<<<< master
|
#if defined(CONFIG_440)
|
||||||
#if !defined(CFG_EXT_SERIAL_CLOCK)
|
#if !defined(CFG_EXT_SERIAL_CLOCK)
|
||||||
static void serial_divs (int baudrate, unsigned long *pudiv,
|
static void serial_divs (int baudrate, unsigned long *pudiv,
|
||||||
unsigned short *pbdiv)
|
unsigned short *pbdiv)
|
||||||
@ -181,9 +181,6 @@ static void serial_divs (int baudrate, unsigned long *pudiv,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
=======
|
|
||||||
#if defined(CONFIG_440)
|
|
||||||
>>>>>>> zeus
|
|
||||||
static int uart_post_init (unsigned long dev_base)
|
static int uart_post_init (unsigned long dev_base)
|
||||||
{
|
{
|
||||||
unsigned long reg;
|
unsigned long reg;
|
||||||
|
Loading…
Reference in New Issue
Block a user