diff options
| author | Tom Rini <trini@ti.com> | 2014-08-25 08:34:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-08-25 08:34:39 -0400 |
| commit | 7bee1c91a94db19bd26f92cc67be35d3592c6429 (patch) | |
| tree | a8e29376b47450c7a3b653e16df3ff9f603f2ca3 /drivers | |
| parent | 055626acba2754d3311204ad361b1828a4f8aaf6 (diff) | |
| parent | 9fa7bbc126d697f1415adbac72bb7f6d978ff50d (diff) | |
| download | blackbird-obmc-uboot-7bee1c91a94db19bd26f92cc67be35d3592c6429.tar.gz blackbird-obmc-uboot-7bee1c91a94db19bd26f92cc67be35d3592c6429.zip | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/pci.c | 2 | ||||
| -rw-r--r-- | drivers/rtc/Makefile | 1 | ||||
| -rw-r--r-- | drivers/rtc/ds1307.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index ed113bf402..4fd9c532b3 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -323,7 +323,7 @@ int __pci_hose_bus_to_phys(struct pci_controller *hose, continue; if (bus_addr >= res->bus_start && - bus_addr < res->bus_start + res->size) { + (bus_addr - res->bus_start) < res->size) { *pa = (bus_addr - res->bus_start + res->phys_start); return 0; } diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index 003d322d23..43f85460a3 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_RTC_DS1302) += ds1302.o obj-$(CONFIG_RTC_DS1306) += ds1306.o obj-$(CONFIG_RTC_DS1307) += ds1307.o obj-$(CONFIG_RTC_DS1338) += ds1307.o +obj-$(CONFIG_RTC_DS1339) += ds1307.o obj-$(CONFIG_RTC_DS1337) += ds1337.o obj-$(CONFIG_RTC_DS1374) += ds1374.o obj-$(CONFIG_RTC_DS1388) += ds1337.o diff --git a/drivers/rtc/ds1307.c b/drivers/rtc/ds1307.c index 1a2bad3c5c..03ab1a8c5d 100644 --- a/drivers/rtc/ds1307.c +++ b/drivers/rtc/ds1307.c @@ -9,7 +9,7 @@ /* * Date & Time support (no alarms) for Dallas Semiconductor (now Maxim) - * DS1307 and DS1338 Real Time Clock (RTC). + * DS1307 and DS1338/9 Real Time Clock (RTC). * * based on ds1337.c */ |
