diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-12-17 08:48:27 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-12-17 08:48:27 -0800 |
| commit | d3d3a134d75d28034b950bc0b6682ba0be976f37 (patch) | |
| tree | 71365703ae44c980a80f9b2c02d664cbc3ddd935 /drivers/mmc/host/sdhci.h | |
| parent | a143f427f3e7c6d80bc1d288334706a1f8237f5f (diff) | |
| parent | 8b20b3796da06d8ada347c4eaf289c3127da155f (diff) | |
Merge branch 'v4.1/topic/rt' into linux-linaro-lsk-v4.1-rt
Diffstat (limited to 'drivers/mmc/host/sdhci.h')
| -rw-r--r-- | drivers/mmc/host/sdhci.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index e639b7f435e5..eea23f62356a 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -309,9 +309,10 @@ struct sdhci_adma2_64_desc { */ #define SDHCI_MAX_SEGS 128 -struct sdhci_host_next { - unsigned int sg_count; - s32 cookie; +enum sdhci_cookie { + COOKIE_UNMAPPED, + COOKIE_MAPPED, + COOKIE_GIVEN, }; struct sdhci_host { @@ -506,7 +507,6 @@ struct sdhci_host { #define SDHCI_TUNING_MODE_1 0 struct timer_list tuning_timer; /* Timer for tuning */ - struct sdhci_host_next next_data; unsigned long private[0] ____cacheline_aligned; }; |