2 files changed, 2 insertions, 10 deletions

diff --git a/include/linux/platform_data/hsmmc-omap.h b/include/linux/platform_data/hsmmc-omap.h
index 8e981be2e2c2..0ff1e0dba720 100644
--- a/include/linux/platform_data/hsmmc-omap.h
+++ b/include/linux/platform_data/hsmmc-omap.h
@@ -55,9 +55,6 @@ struct omap_hsmmc_platform_data {
         u32 caps;       /* Used for the MMC driver on 2430 and later */
         u32 pm_caps;    /* PM capabilities of the mmc */
 
-        /* use the internal clock */
-        unsigned internal_clock:1;
-
         /* nonremovable e.g. eMMC */
         unsigned nonremovable:1;
 
@@ -73,13 +70,6 @@ struct omap_hsmmc_platform_data {
         int gpio_cd;                    /* gpio (card detect) */
         int gpio_cod;                   /* gpio (cover detect) */
         int gpio_wp;                    /* gpio (write protect) */
-
-        int (*set_power)(struct device *dev, int power_on, int vdd);
-        void (*remux)(struct device *dev, int power_on);
-        /* Call back before enabling / disabling regulators */
-        void (*before_set_reg)(struct device *dev, int power_on, int vdd);
-        /* Call back after enabling / disabling regulators */
-        void (*after_set_reg)(struct device *dev, int power_on, int vdd);
         /* if we have special card, init it using this callback */
         void (*init_card)(struct mmc_card *card);
 
diff --git a/include/linux/platform_data/st_sensors_pdata.h b/include/linux/platform_data/st_sensors_pdata.h
index 79b0e4cdb814..f8274b0c6888 100644
--- a/include/linux/platform_data/st_sensors_pdata.h
+++ b/include/linux/platform_data/st_sensors_pdata.h
@@ -17,10 +17,12 @@
  *      Available only for accelerometer and pressure sensors.
  *      Accelerometer DRDY on LSM330 available only on pin 1 (see datasheet).
  * @open_drain: set the interrupt line to be open drain if possible.
+ * @spi_3wire: enable spi-3wire mode.
  */
 struct st_sensors_platform_data {
         u8 drdy_int_pin;
         bool open_drain;
+        bool spi_3wire;
 };
 
 #endif /* ST_SENSORS_PDATA_H */