diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 01:26:12 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 01:26:12 -0800 |
| commit | e3f4e1cbc341bc2020241d8119bd078db3ec3b85 (patch) | |
| tree | 8b23624cc792f60d0bf86d787c3514cf0fb04418 /drivers/ide/ide_platform.c | |
| parent | adfe67ddffbea51322b118896178bd71aaa4b4d8 (diff) | |
| parent | d71cb81af3817193bc605de061da0499934263a6 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/ide/ide_platform.c')
| -rw-r--r-- | drivers/ide/ide_platform.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide_platform.c b/drivers/ide/ide_platform.c index b579fbe8837..42965b3e30b 100644 --- a/drivers/ide/ide_platform.c +++ b/drivers/ide/ide_platform.c @@ -81,14 +81,14 @@ static int __devinit plat_ide_probe(struct platform_device *pdev) if (mmio) { base = devm_ioremap(&pdev->dev, - res_base->start, res_base->end - res_base->start + 1); + res_base->start, resource_size(res_base)); alt_base = devm_ioremap(&pdev->dev, - res_alt->start, res_alt->end - res_alt->start + 1); + res_alt->start, resource_size(res_alt)); } else { base = devm_ioport_map(&pdev->dev, - res_base->start, res_base->end - res_base->start + 1); + res_base->start, resource_size(res_base)); alt_base = devm_ioport_map(&pdev->dev, - res_alt->start, res_alt->end - res_alt->start + 1); + res_alt->start, resource_size(res_alt)); } memset(&hw, 0, sizeof(hw)); |