diff options
| author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2009-11-07 06:47:24 +0530 |
|---|---|---|
| committer | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2009-11-07 06:47:24 +0530 |
| commit | 8aa5e79648ce7b16943456f2578b9b68573aac9c (patch) | |
| tree | 5b6b444145e329472fe2e4d16ac47e7c3a9119c0 /drivers | |
| parent | c1aa68e48f1b92da242edc657138ff91c1202536 (diff) | |
| parent | 8408f329f398bd408002e074bd629bf31249183a (diff) | |
Merge branch 'omap4_sdc' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into L24.1-rc1_audio
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 05663800af3e..1e9a195edc0c 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1019,7 +1019,7 @@ static int omap_hsmmc_get_cd(struct mmc_host *mmc) struct mmc_omap_host *host = mmc_priv(mmc); struct omap_mmc_platform_data *pdata = host->pdata; - if (host->id == OMAP_MMC2_DEVID) + if (host->id == OMAP_MMC1_DEVID || host->id == OMAP_MMC2_DEVID) return 1 ; if (!pdata->slots[0].card_detect) return -ENOSYS; |