diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:10:39 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:10:39 -0400 |
| commit | 739cdbf1d8f0739b80035b80d69d871e33749b86 (patch) | |
| tree | 15134df8723ab7d7a5524c99070f02d5739bad0d /arch/arm/mach-ixp4xx/ixdp425-setup.c | |
| parent | 83bbecc905b3431c60fe282830e09aaaab97b26a (diff) | |
| parent | 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/arm/mach-ixp4xx/ixdp425-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/ixdp425-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c index 4633470a6a37..fa0646c8693b 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c | |||
| @@ -36,7 +36,7 @@ static struct flash_platform_data ixdp425_flash_data = { | |||
| 36 | 36 | ||
| 37 | static struct resource ixdp425_flash_resource = { | 37 | static struct resource ixdp425_flash_resource = { |
| 38 | .start = IXDP425_FLASH_BASE, | 38 | .start = IXDP425_FLASH_BASE, |
| 39 | .end = IXDP425_FLASH_BASE + IXDP425_FLASH_SIZE, | 39 | .end = IXDP425_FLASH_BASE + IXDP425_FLASH_SIZE - 1, |
| 40 | .flags = IORESOURCE_MEM, | 40 | .flags = IORESOURCE_MEM, |
| 41 | }; | 41 | }; |
| 42 | 42 | ||