diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-10-10 12:56:28 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-10-10 13:10:27 -0700 |
| commit | fed8e608c338037d3ae408089631b731d21a8d80 (patch) | |
| tree | e7f5e2b709939b753818d679262a1ecf6ca2113b /include/linux/mmc | |
| parent | 09f6247a9ccaffcc9af1e4a9038e14ecdb76a79d (diff) | |
| parent | 78c26bebd182874a7383a5d07446673b61d1ea0e (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
Change-Id: I203e905e0a63db40a5bb8ee85fcac1e128736331
Diffstat (limited to 'include/linux/mmc')
| -rw-r--r-- | include/linux/mmc/core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h index 3349f0676acb..0860efd6e1be 100644 --- a/include/linux/mmc/core.h +++ b/include/linux/mmc/core.h @@ -137,7 +137,9 @@ struct mmc_request { void (*done)(struct mmc_request *);/* completion function */ struct mmc_host *host; ktime_t io_start; +#ifdef CONFIG_BLOCK int lat_hist_enabled; +#endif }; struct mmc_card; |