diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /arch/arm/mach-ixp23xx/ixdp2351.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'arch/arm/mach-ixp23xx/ixdp2351.c')
| -rw-r--r-- | arch/arm/mach-ixp23xx/ixdp2351.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp23xx/ixdp2351.c b/arch/arm/mach-ixp23xx/ixdp2351.c index 535b334ee045..e0886871cc77 100644 --- a/arch/arm/mach-ixp23xx/ixdp2351.c +++ b/arch/arm/mach-ixp23xx/ixdp2351.c | |||
| @@ -304,7 +304,7 @@ static struct physmap_flash_data ixdp2351_flash_data = { | |||
| 304 | 304 | ||
| 305 | static struct resource ixdp2351_flash_resource = { | 305 | static struct resource ixdp2351_flash_resource = { |
| 306 | .start = 0x90000000, | 306 | .start = 0x90000000, |
| 307 | .end = 0x94000000, | 307 | .end = 0x93ffffff, |
| 308 | .flags = IORESOURCE_MEM, | 308 | .flags = IORESOURCE_MEM, |
| 309 | }; | 309 | }; |
| 310 | 310 | ||