diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-28 23:27:48 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-28 23:27:48 -0400 |
| commit | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (patch) | |
| tree | 7b72b1fae85137435d5b98f4614df2195f612acc /arch/arm/mach-ep93xx/gesbc9312.c | |
| parent | 607f31e80b6f982d7c0dd7a5045377fc368fe507 (diff) | |
| parent | 0a6047eef1c465c38aacfbdab193161b3f0cd144 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'arch/arm/mach-ep93xx/gesbc9312.c')
| -rw-r--r-- | arch/arm/mach-ep93xx/gesbc9312.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c index 47cc6c8b7c79..2c28d66d260e 100644 --- a/arch/arm/mach-ep93xx/gesbc9312.c +++ b/arch/arm/mach-ep93xx/gesbc9312.c | |||
| @@ -30,7 +30,7 @@ static struct physmap_flash_data gesbc9312_flash_data = { | |||
| 30 | 30 | ||
| 31 | static struct resource gesbc9312_flash_resource = { | 31 | static struct resource gesbc9312_flash_resource = { |
| 32 | .start = 0x60000000, | 32 | .start = 0x60000000, |
| 33 | .end = 0x60800000, | 33 | .end = 0x607fffff, |
| 34 | .flags = IORESOURCE_MEM, | 34 | .flags = IORESOURCE_MEM, |
| 35 | }; | 35 | }; |
| 36 | 36 | ||