Merge branch 'for-linus' of git://neil.brown.name/md

[linux-2.6-omap-h63xx.git] / include / linux / mtd / ndfc.h

diff --git a/include/linux/mtd/ndfc.h b/include/linux/mtd/ndfc.h
index 31d61f07d7689e7efdc6f1dc4666225d15c6f1bf..d0558a9826287e6560491c98b22253b98d44b9a2 100644 (file)
--- a/include/linux/mtd/ndfc.h
+++ b/include/linux/mtd/ndfc.h
@@ -56,7 +56,8 @@
 #define NDFC_MAX_BANKS         4
 
 struct ndfc_controller_settings {
-       uint32_t                ccr_settings;
+       uint32_t        ccr_settings;
+       uint64_t        ndfc_erpn;
 };
 
 struct ndfc_chip_settings {