git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[sfrench/cifs-2.6.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 eb35fca9aea527bde9992f80917fd69cc174c346..3478eae32d8a8b8fe130e4e5c5f2c8f8a4694476 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;
+ /* allow platform code to keep OBM/bootloader defined NFC config */
+ int keep_config;
+
const struct mtd_partition *parts;
unsigned int nr_parts;