diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-26 20:00:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-26 20:00:35 -0700 |
| commit | 8fe5f56c8a203a7a83d1b621c369655d914f3752 (patch) | |
| tree | ec865efb2d577d1e536720a28ae18b10bdbfd973 /drivers/mmc/host/sdhci.c | |
| parent | df2e7f525d88da992021b589d8a412afc15de36c (diff) | |
| parent | 82b769063598d01a8b24abf250a53f8b437e09f1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Conflicts:
arch/sparc/kernel/leon_smp.c
Merge mainline to get the nobootmem.c bug fix, for the sake
of the sparc64 NO_BOOTMEM conversion.
Resolve a small include line conflict in leon_smp.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 9aa77f3f04a8..ccefdebeff14 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -147,7 +147,7 @@ static void sdhci_set_card_detection(struct sdhci_host *host, bool enable) u32 present, irqs; if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) || - !mmc_card_is_removable(host->mmc)) + (host->mmc->caps & MMC_CAP_NONREMOVABLE)) return; present = sdhci_readl(host, SDHCI_PRESENT_STATE) & |