diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-16 18:36:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-16 18:36:47 -0700 |
| commit | 477de0de446210eb5c87e2a54c9ba4c8844fb98b (patch) | |
| tree | 399098973886cd595d33b375cefd022b9461c88c /include | |
| parent | b5e6ab589d570ac79cc939517fab05c87a23c262 (diff) | |
| parent | 86f315bbb2374f1f077500ad131dd9b71856e697 (diff) | |
| download | linux-477de0de446210eb5c87e2a54c9ba4c8844fb98b.tar.gz linux-477de0de446210eb5c87e2a54c9ba4c8844fb98b.tar.bz2 linux-477de0de446210eb5c87e2a54c9ba4c8844fb98b.zip | |
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:
Revert "mmc: fix a race between card-detect rescan and clock-gate work instances"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmc/host.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index eb792cb6d745..bcb793ec7374 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -183,6 +183,7 @@ struct mmc_host { struct work_struct clk_gate_work; /* delayed clock gate */ unsigned int clk_old; /* old clock value cache */ spinlock_t clk_lock; /* lock for clk fields */ + struct mutex clk_gate_mutex; /* mutex for clock gating */ #endif /* host specific block data */ |