diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-02 11:05:57 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-02 11:05:57 +0200 |
| commit | 1510c57e93fdfdc8f5f6f6b2bbce44ac9a313172 (patch) | |
| tree | 059d0c10daff1f46c288c04502242770cda2f9ef /commands/mem.c | |
| parent | 8c3daadecbff2674f56e057b6cb0788dff906aea (diff) | |
| parent | 5f03074ea98b64b55c133b35ee144fdc909e6d69 (diff) | |
| download | barebox-1510c57e93fdfdc8f5f6f6b2bbce44ac9a313172.tar.gz barebox-1510c57e93fdfdc8f5f6f6b2bbce44ac9a313172.tar.xz | |
Merge branch 'for-next/resource-size'
Conflicts:
drivers/base/resource.c
fs/fs.c
Diffstat (limited to 'commands/mem.c')
| -rw-r--r-- | commands/mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/commands/mem.c b/commands/mem.c index 407470d7be..c1a3a54053 100644 --- a/commands/mem.c +++ b/commands/mem.c @@ -593,7 +593,7 @@ static int mem_probe(struct device_d *dev) dev->priv = cdev; cdev->name = (char*)dev->resource[0].name; - cdev->size = (unsigned long)dev->resource[0].size; + cdev->size = (unsigned long)resource_size(&dev->resource[0]); cdev->ops = &memops; cdev->dev = dev; |