Merge tag 'omap-gpmc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap2 / board-rx51-peripherals.c

diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index e2ad48b5d9c00fddfac07409671a89b2df869274..03502abe4f2efbd82d3140c3cddd0a244275d0ee 100644 (file)
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -482,7 +482,7 @@ static struct omap_mux_partition *partition;
  * Current flows to eMMC when eMMC is off and the data lines are pulled up,
  * so pull them down. N.B. we pull 8 lines because we are using 8 lines.
  */
-static void rx51_mmc2_remux(struct device *dev, int slot, int power_on)
+static void rx51_mmc2_remux(struct device *dev, int power_on)
 {
        if (power_on)
                omap_mux_write_array(partition, rx51_mmc2_on_mux);
@@ -498,7 +498,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
                .cover_only     = true,
                .gpio_cd        = 160,
                .gpio_wp        = -EINVAL,
-               .power_saving   = true,
        },
        {
                .name           = "internal",
@@ -508,7 +507,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
                .gpio_cd        = -EINVAL,
                .gpio_wp        = -EINVAL,
                .nonremovable   = true,
-               .power_saving   = true,
                .remux          = rx51_mmc2_remux,
        },
        {}      /* Terminator */