rtc: Fix merging problem
authorStefan Roese <sr@denx.de>
Tue, 11 Dec 2007 10:46:01 +0000 (11:46 +0100)
committerStefan Roese <sr@denx.de>
Tue, 11 Dec 2007 10:46:01 +0000 (11:46 +0100)
commit8809a2713b1ceaf3da55d9d785470294f15de06a
treed03a29ce11d285002f9e4d65263af4680bdd9386
parent9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105
rtc: Fix merging problem

Signed-off-by: Stefan Roese <sr@denx.de>
drivers/rtc/x1205.c [moved from rtc/x1205.c with 100% similarity]