From: Stefan Roese Date: Tue, 11 Dec 2007 10:46:01 +0000 (+0100) Subject: rtc: Fix merging problem X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=8809a2713b1ceaf3da55d9d785470294f15de06a;p=u-boot.git rtc: Fix merging problem Signed-off-by: Stefan Roese --- diff --git a/rtc/x1205.c b/drivers/rtc/x1205.c similarity index 100% rename from rtc/x1205.c rename to drivers/rtc/x1205.c