rtc: Fix merging problem

Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese 2007-12-11 11:46:01 +01:00
parent 9caeaadf50
commit 8809a2713b