Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6:
  sl82c105: remove no longer needed debugging code
  sis5513: remove stale TODO
  pdc202xx_old: remove no longer needed debugging code
  cy82c693: remove no longer needed debugging code
  cmd64x: remove no longer needed debugging code
  alim15x3: remove obsolete and dangerous wdc_udma parameter
  ide: Increase WAIT_DRQ to accomodate some CF cards and SSD drives.
  cs5535: add pci id for AMD based CS5535 controllers
  slc90e66: fix UDMA handling
  drivers/ide/tx4938ide.c: use resource_size()
  drivers/ide/ide_platform.c: use resource_size()
  drivers/ide/au1xxx-ide.c: use resource_size()
  hpt366: remove dead old timing tables
  ide: update Kconfig text to mark as deprecated
  ide-tape: remove the BKL
  hpt366: kill unused #define's

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/ide/ide_platform.c b/drivers/ide/ide_platform.c
index b579fbe88370..42965b3e30b9 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));