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/roadrunner.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/roadrunner.c')
| -rw-r--r-- | arch/arm/mach-ixp23xx/roadrunner.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp23xx/roadrunner.c b/arch/arm/mach-ixp23xx/roadrunner.c index b9f5d13fcfe1..92ad18f41251 100644 --- a/arch/arm/mach-ixp23xx/roadrunner.c +++ b/arch/arm/mach-ixp23xx/roadrunner.c | |||
| @@ -143,7 +143,7 @@ static struct physmap_flash_data roadrunner_flash_data = { | |||
| 143 | 143 | ||
| 144 | static struct resource roadrunner_flash_resource = { | 144 | static struct resource roadrunner_flash_resource = { |
| 145 | .start = 0x90000000, | 145 | .start = 0x90000000, |
| 146 | .end = 0x94000000, | 146 | .end = 0x93ffffff, |
| 147 | .flags = IORESOURCE_MEM, | 147 | .flags = IORESOURCE_MEM, |
| 148 | }; | 148 | }; |
| 149 | 149 | ||