Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[u-boot] / include / mmc.h

diff --git a/include/mmc.h b/include/mmc.h
index b63b2c32a0960ca477ccb793ff1278aa1633147f..de6d497d530a611f6f4dc54cb226ec2aa532ea67 100644 (file)
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -215,7 +215,6 @@ struct mmc_cmd {
        uint resp_type;
        uint cmdarg;
        uint response[4];
-       uint flags;
 };
 
 struct mmc_data {
@@ -260,6 +259,7 @@ struct mmc {
        void (*set_ios)(struct mmc *mmc);
        int (*init)(struct mmc *mmc);
        int (*getcd)(struct mmc *mmc);
+       int (*getwp)(struct mmc *mmc);
        uint b_max;
 };
 
@@ -275,6 +275,7 @@ int get_mmc_num(void);
 int board_mmc_getcd(struct mmc *mmc);
 int mmc_switch_part(int dev_num, unsigned int part_num);
 int mmc_getcd(struct mmc *mmc);
+int mmc_getwp(struct mmc *mmc);
 void spl_mmc_load(void) __noreturn;
 
 #ifdef CONFIG_GENERIC_MMC