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 /arch/nios2 | |
| 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 'arch/nios2')
| -rw-r--r-- | arch/nios2/boards/generic/generic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/nios2/boards/generic/generic.c b/arch/nios2/boards/generic/generic.c index b51b94afbf..2c998fe3ac 100644 --- a/arch/nios2/boards/generic/generic.c +++ b/arch/nios2/boards/generic/generic.c @@ -9,17 +9,17 @@ static int phy_address = 1; static struct resource mac_resources[] = { [0] = { .start = NIOS_SOPC_TSE_BASE, - .size = 0x400, + .end = NIOS_SOPC_TSE_BASE + 0x400 - 1, .flags = IORESOURCE_MEM, }, [1] = { .start = NIOS_SOPC_SGDMA_RX_BASE, - .size = 0x40, + .end = 0x40 + NIOS_SOPC_SGDMA_RX_BASE - 1, .flags = IORESOURCE_MEM, }, [2] = { .start = NIOS_SOPC_SGDMA_TX_BASE, - .size = 0x40, + .end = 0x40 + NIOS_SOPC_SGDMA_TX_BASE - 1, .flags = IORESOURCE_MEM, }, }; |