diff options
| author | Stefan Roese <sr@denx.de> | 2007-12-11 11:46:01 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-12-11 11:46:01 +0100 |
| commit | 8809a2713b1ceaf3da55d9d785470294f15de06a (patch) | |
| tree | d03a29ce11d285002f9e4d65263af4680bdd9386 | |
| parent | 9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105 (diff) | |
| download | talos-obmc-uboot-8809a2713b1ceaf3da55d9d785470294f15de06a.tar.gz talos-obmc-uboot-8809a2713b1ceaf3da55d9d785470294f15de06a.zip | |
rtc: Fix merging problem
Signed-off-by: Stefan Roese <sr@denx.de>
| -rw-r--r-- | drivers/rtc/x1205.c (renamed from rtc/x1205.c) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/rtc/x1205.c b/drivers/rtc/x1205.c index 319f0512ca..319f0512ca 100644 --- a/rtc/x1205.c +++ b/drivers/rtc/x1205.c |
