diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-11-23 14:46:10 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-11-23 14:46:10 -0800 |
| commit | 52f3a41e0aca5625fbd118ed57a4debb25817e99 (patch) | |
| tree | 86730c862fc97eef5f1eb1a81bf74bf2a8a36754 /arch/arm/mach-shmobile/board-ap4evb.c | |
| parent | e9b7086b80c4d9e354f4edc9e280ae85a60df408 (diff) | |
| parent | 8770b07c2dff3cec2c751b289ee690137c88ea54 (diff) | |
Merge branch 'fixes-v3.2-rc2' into fixes
Diffstat (limited to 'arch/arm/mach-shmobile/board-ap4evb.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-ap4evb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index a3aa0f6df964..4c865ece9ac4 100644 --- a/arch/arm/mach-shmobile/board-ap4evb.c +++ b/arch/arm/mach-shmobile/board-ap4evb.c @@ -201,7 +201,7 @@ static struct physmap_flash_data nor_flash_data = { static struct resource nor_flash_resources[] = { [0] = { .start = 0x20000000, /* CS0 shadow instead of regular CS0 */ - .end = 0x28000000 - 1, /* needed by USB MASK ROM boot */ + .end = 0x28000000 - 1, /* needed by USB MASK ROM boot */ .flags = IORESOURCE_MEM, } }; |