From ff30f01e639c59c25da146b4a00adeb2232e2a58 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Fri, 30 Nov 2012 16:31:13 +0100 Subject: [PATCH] --- yaml --- r: 339518 b: refs/heads/master c: 2148b93ac86665ee70aea684bac003b3deb31dde h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-integrator/impd1.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e56091dba9b0..e41897772ad0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ad909bc8f2ea32fd7d24266c61cd4605feecec8 +refs/heads/master: 2148b93ac86665ee70aea684bac003b3deb31dde diff --git a/trunk/arch/arm/mach-integrator/impd1.c b/trunk/arch/arm/mach-integrator/impd1.c index e428f3ab15c7..5973109fb874 100644 --- a/trunk/arch/arm/mach-integrator/impd1.c +++ b/trunk/arch/arm/mach-integrator/impd1.c @@ -402,9 +402,10 @@ static int impd1_probe(struct lm_device *dev) pc_base = dev->resource.start + idev->offset; snprintf(devname, 32, "lm%x:%5.5lx", dev->id, idev->offset >> 12); - d = amba_ahb_device_add(&dev->dev, devname, pc_base, SZ_4K, - dev->irq, dev->irq, - idev->platform_data, idev->id); + d = amba_ahb_device_add_res(&dev->dev, devname, pc_base, SZ_4K, + dev->irq, dev->irq, + idev->platform_data, idev->id, + &dev->resource); if (IS_ERR(d)) { dev_err(&dev->dev, "unable to register device: %ld\n", PTR_ERR(d)); continue;