Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c
index 73e24ef5a2f9..10a6dc3d37ac 100644
--- a/drivers/spi/spi_bfin5xx.c
+++ b/drivers/spi/spi_bfin5xx.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/device.h>
+#include <linux/slab.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/irq.h>
@@ -1294,7 +1295,7 @@ static int __init bfin_spi_probe(struct platform_device *pdev)
                 goto out_error_get_res;
         }
 
-        drv_data->regs_base = ioremap(res->start, (res->end - res->start + 1));
+        drv_data->regs_base = ioremap(res->start, resource_size(res));
         if (drv_data->regs_base == NULL) {
                 dev_err(dev, "Cannot map IO\n");
                 status = -ENXIO;