misc: Fix merge conflicts from 3.4.10 stable merge
* MSM8X60 should select ARM_ERRATA_720789
* SDHCI driver does not allow for tuning opcode
* Remove unused variable in ext4/resize.c
Change-Id: I2acf14e162f5b4dfa27a9bf088a2db218aeb5a99
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 0a239d8..44472ea 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -135,6 +135,7 @@
select MSM_PM8X60 if PM
select MSM_RUN_QUEUE_STATS
select ARM_HAS_SG_CHAIN
+ select ARM_ERRATA_720789
config ARCH_MSM8960
bool "MSM8960"
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index a333271..43f7e77 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1251,7 +1251,7 @@
if ((host->flags & SDHCI_NEEDS_RETUNING) &&
!(present_state & (SDHCI_DOING_WRITE | SDHCI_DOING_READ))) {
spin_unlock_irqrestore(&host->lock, flags);
- sdhci_execute_tuning(mmc, mrq->cmd->opcode);
+ sdhci_execute_tuning(mmc);
spin_lock_irqsave(&host->lock, flags);
/* Restore original mmc_request structure */
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 3407a62..aa72ee7 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -1141,7 +1141,7 @@
struct ext4_new_group_data *group_data = flex_gd->groups;
struct ext4_sb_info *sbi = EXT4_SB(sb);
struct ext4_super_block *es = sbi->s_es;
- int i, ret;
+ int i;
BUG_ON(flex_gd->count == 0 || group_data == NULL);
/*