rtc: Fix merging problem

Signed-off-by: Stefan Roese <sr@denx.de>
1 file changed