POST: Fix merge problem
authorStefan Roese <sr@denx.de>
Tue, 14 Aug 2007 13:12:01 +0000 (15:12 +0200)
committerStefan Roese <sr@denx.de>
Tue, 14 Aug 2007 13:12:01 +0000 (15:12 +0200)
commit4ce846ec59f36b85d6644a769690ad3feb667575
tree6dfedf3eeebbab0eefde4d5d17e5fffec10c9536
parent429d9571f60631ae8a2fe12b11be4c75b0c2b37c
POST: Fix merge problem

Signed-off-by: Stefan Roese <sr@denx.de>
post/cpu/ppc4xx/uart.c