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 v2.6.37-rc8 into powerpc/next
[pandora-kernel.git]
/
arch
/
arm
/
mach-orion5x
/
ts78xx-setup.c
diff --git
a/arch/arm/mach-orion5x/ts78xx-setup.c
b/arch/arm/mach-orion5x/ts78xx-setup.c
index
16f1bd5
..
c1c1cd0
100644
(file)
--- a/
arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/
arch/arm/mach-orion5x/ts78xx-setup.c
@@
-239,7
+239,7
@@
static struct platform_nand_data ts78xx_ts_nand_data = {
static struct resource ts78xx_ts_nand_resources = {
.start = TS_NAND_DATA,
.end = TS_NAND_DATA + 4,
- .flags = IORESOURCE_
IO
,
+ .flags = IORESOURCE_
MEM
,
};
static struct platform_device ts78xx_ts_nand_device = {