diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-08 16:42:27 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-08 16:42:27 -0700 |
| commit | 2a3670c62203b1a11b496ec6585393b8abf9736f (patch) | |
| tree | 8b738e881b33d8dbdc5b713af2d9490091ae55d6 /include/linux/mmc | |
| parent | cade80573cf8a76e46a95f8a714dd264c67bcb96 (diff) | |
| parent | a38338f1cd595f6a66870ba46cc6a4ae7378c084 (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
Diffstat (limited to 'include/linux/mmc')
| -rw-r--r-- | include/linux/mmc/host.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index e4862f7cdede..97b2b0b1f99d 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -380,8 +380,10 @@ struct mmc_host { } embedded_sdio_data; #endif +#ifdef CONFIG_BLOCK int latency_hist_enabled; struct io_latency_state io_lat_s; +#endif unsigned long private[0] ____cacheline_aligned; }; |