git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
arm
/
mach-shmobile
/
board-ap4evb.c
diff --git
a/arch/arm/mach-shmobile/board-ap4evb.c
b/arch/arm/mach-shmobile/board-ap4evb.c
index
f9f66c2
..
4c865ec
100644
(file)
--- a/
arch/arm/mach-shmobile/board-ap4evb.c
+++ b/
arch/arm/mach-shmobile/board-ap4evb.c
@@
-200,8
+200,8
@@
static struct physmap_flash_data nor_flash_data = {
static struct resource nor_flash_resources[] = {
[0] = {
static struct resource nor_flash_resources[] = {
[0] = {
- .start = 0x
00000000,
- .end = 0x
08000000 - 1,
+ .start = 0x
20000000, /* CS0 shadow instead of regular CS0 */
+ .end = 0x
28000000 - 1, /* needed by USB MASK ROM boot */
.flags = IORESOURCE_MEM,
}
};
.flags = IORESOURCE_MEM,
}
};