Merge tag 'for-linus-20130301' of git://git.infradead.org/linux-mtd

[karo-tx-linux.git] / include / linux / bcma / bcma_driver_chipcommon.h

diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h
index 1d002b58b60babc1e7bf28728406531b0bc3addc..8390c474f69aefafdd31e8da31c1ea1ea1339516 100644 (file)
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
@@ -528,6 +528,7 @@ struct bcma_sflash {
        u32 size;
 
        struct mtd_info *mtd;
+       void *priv;
 };
 #endif