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 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
pxa3xx_nand.h
diff --git
a/arch/arm/mach-pxa/include/mach/pxa3xx_nand.h
b/arch/arm/mach-pxa/include/mach/pxa3xx_nand.h
index
eb35fca
..
3478eae
100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/pxa3xx_nand.h
+++ b/
arch/arm/mach-pxa/include/mach/pxa3xx_nand.h
@@
-49,6
+49,9
@@
struct pxa3xx_nand_platform_data {
*/
int enable_arbiter;
*/
int enable_arbiter;
+ /* allow platform code to keep OBM/bootloader defined NFC config */
+ int keep_config;
+
const struct mtd_partition *parts;
unsigned int nr_parts;
const struct mtd_partition *parts;
unsigned int nr_parts;