diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 11:05:51 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 11:05:51 +0200 |
| commit | f8327af20c1c2988b0d9909f403780e31cc6b59e (patch) | |
| tree | 80eb52cc1160e577646e136ad9e3e4638aac5559 /drivers/gpio | |
| parent | b568687bc3c48edd814c4b4546d049d859c8cc3f (diff) | |
| parent | 9f556d4b6fc71d548e5c984c416f4f1b7d599d2f (diff) | |
| download | barebox-f8327af20c1c2988b0d9909f403780e31cc6b59e.tar.gz barebox-f8327af20c1c2988b0d9909f403780e31cc6b59e.tar.xz | |
Merge branch 'for-next/ioresource'
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c index a2fc400431..5c46282045 100644 --- a/drivers/gpio/gpio-generic.c +++ b/drivers/gpio/gpio-generic.c @@ -310,7 +310,7 @@ static void __iomem *bgpio_map(struct device_d *dev, const char *name, *err = 0; - r = dev_get_resource_by_name(dev, name); + r = dev_get_resource_by_name(dev, IORESOURCE_MEM, name); if (!r) return NULL; @@ -342,7 +342,7 @@ static int bgpio_dev_probe(struct device_d *dev) struct bgpio_chip *bgc; struct bgpio_pdata *pdata = dev->platform_data; - r = dev_get_resource_by_name(dev, "dat"); + r = dev_get_resource_by_name(dev, IORESOURCE_MEM, "dat"); if (!r) return -EINVAL; |