diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-23 10:00:05 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-23 10:00:05 -0800 |
| commit | 193cb93e5a5f32c0520eed17e87135d20594d1e1 (patch) | |
| tree | 3b5584f4e5e73f5f01807e5176cbe29e1db69868 /drivers/rtc/rtc-vr41xx.c | |
| parent | 23e707dd9b0b26215d801c59e87feed1c218a0f9 (diff) | |
| parent | f42ecb2808db5386f983d593a7c08d3ea3b94a27 (diff) | |
| download | kernel-crypto-193cb93e5a5f32c0520eed17e87135d20594d1e1.tar.gz kernel-crypto-193cb93e5a5f32c0520eed17e87135d20594d1e1.tar.xz kernel-crypto-193cb93e5a5f32c0520eed17e87135d20594d1e1.zip | |
Merge branch 'master' of /home/gregkh/linux/git/torvalds-2.6
Diffstat (limited to 'drivers/rtc/rtc-vr41xx.c')
| -rw-r--r-- | drivers/rtc/rtc-vr41xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c index fadddac1e5a..c3244244e8c 100644 --- a/drivers/rtc/rtc-vr41xx.c +++ b/drivers/rtc/rtc-vr41xx.c @@ -327,7 +327,7 @@ static int __devinit rtc_probe(struct platform_device *pdev) if (!res) return -EBUSY; - rtc1_base = ioremap(res->start, res->end - res->start + 1); + rtc1_base = ioremap(res->start, resource_size(res)); if (!rtc1_base) return -EBUSY; @@ -337,7 +337,7 @@ static int __devinit rtc_probe(struct platform_device *pdev) goto err_rtc1_iounmap; } - rtc2_base = ioremap(res->start, res->end - res->start + 1); + rtc2_base = ioremap(res->start, resource_size(res)); if (!rtc2_base) { retval = -EBUSY; goto err_rtc1_iounmap; |