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 /drivers/usb/host | |
| 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 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/ohci-at91.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 2ce7c6ecc5..b3e9909df0 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -64,7 +64,7 @@ static int at91_ohci_probe(struct device_d *dev) writel(0, ®s->control); add_generic_device("ohci", DEVICE_ID_DYNAMIC, NULL, dev->resource[0].start, - dev->resource[0].size, IORESOURCE_MEM, NULL); + resource_size(&dev->resource[0]), IORESOURCE_MEM, NULL); return 0; } |