Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 23:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

POST: Fix merge problem

Browse source 
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese 2007-08-14 15:12:01 +02:00
parent 429d9571f6
commit 4ce846ec59
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
post/cpu/ppc4xx/uart.c
View file

@ -137,7 +137,7 @@
DECLARE_GLOBAL_DATA_PTR;
<<<<<<< master
#if defined(CONFIG_440)
#if !defined(CFG_EXT_SERIAL_CLOCK)
static void serial_divs (int baudrate, unsigned long *pudiv,
unsigned short *pbdiv)
@ -181,9 +181,6 @@ static void serial_divs (int baudrate, unsigned long *pudiv,
}
#endif
=======
#if defined(CONFIG_440)
>>>>>>> zeus
static int uart_post_init (unsigned long dev_base)
{
unsigned long reg;