diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-03 12:24:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-03 12:24:44 -0400 |
| commit | 9a6cd4b45a1372b04bb4c3307f1ce79a0a2e2fa9 (patch) | |
| tree | d4672f9b0388ab49f8e279e9fd69b682549e002c /include/linux | |
| parent | bab0dcc717e28f76f10337a26ed5a14adcd786ce (diff) | |
| parent | 0c9c99a765321104cc5f9c97f949382a9ba4927e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
mmc: sdhci: Check mrq != NULL in sdhci_tasklet_finish
mmc: sdhci: Check mrq->cmd in sdhci_tasklet_finish
mmc: tmio: fix .set_ios(MMC_POWER_UP) handling
mmc: fix a race between card-detect rescan and clock-gate work instances
mmc: omap: Fix possible NULL pointer deref
mmc: core: mmc_add_card(): fix missing break in switch statement
mmc: sdhci-pci: Fix error case in sdhci_pci_probe_slot()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mmc/host.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index bcb793ec7374..eb792cb6d745 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h | |||
| @@ -183,7 +183,6 @@ struct mmc_host { | |||
| 183 | struct work_struct clk_gate_work; /* delayed clock gate */ | 183 | struct work_struct clk_gate_work; /* delayed clock gate */ |
| 184 | unsigned int clk_old; /* old clock value cache */ | 184 | unsigned int clk_old; /* old clock value cache */ |
| 185 | spinlock_t clk_lock; /* lock for clk fields */ | 185 | spinlock_t clk_lock; /* lock for clk fields */ |
| 186 | struct mutex clk_gate_mutex; /* mutex for clock gating */ | ||
| 187 | #endif | 186 | #endif |
| 188 | 187 | ||
| 189 | /* host specific block data */ | 188 | /* host specific block data */ |