diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-01-22 03:44:41 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-01-22 03:44:41 +0300 |
| commit | 281d1bbd34b734e4f22b30b6f3b673dda46a7470 (patch) | |
| tree | f67a2d45d248e9deaa1c68d3f8f33cdf476daacd /include/linux/mmc/sdhci.h | |
| parent | bfa55bd4990815b055162b6d5d031f37a39942a5 (diff) | |
| parent | b942c653ae265abbd31032f3b4f5f857e5c7c723 (diff) | |
| download | linux-281d1bbd34b734e4f22b30b6f3b673dda46a7470.tar.xz | |
Merge remote-tracking branch 'origin/master' into drm-next
Backmerge Linus tree after rc5 + drm-fixes went in.
There were a few amdkfd conflicts I wanted to avoid,
and Ben requested this for nouveau also.
Conflicts:
drivers/gpu/drm/amd/amdkfd/Makefile
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
drivers/gpu/drm/amd/amdkfd/kfd_priv.h
drivers/gpu/drm/amd/include/kgd_kfd_interface.h
drivers/gpu/drm/i915/intel_runtime_pm.c
drivers/gpu/drm/radeon/radeon_kfd.c
Diffstat (limited to 'include/linux/mmc/sdhci.h')
| -rw-r--r-- | include/linux/mmc/sdhci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h index 375af80bde7d..f767a0de611f 100644 --- a/include/linux/mmc/sdhci.h +++ b/include/linux/mmc/sdhci.h @@ -137,6 +137,7 @@ struct sdhci_host { #define SDHCI_SDR104_NEEDS_TUNING (1<<10) /* SDR104/HS200 needs tuning */ #define SDHCI_USING_RETUNING_TIMER (1<<11) /* Host is using a retuning timer for the card */ #define SDHCI_USE_64_BIT_DMA (1<<12) /* Use 64-bit DMA */ +#define SDHCI_HS400_TUNING (1<<13) /* Tuning for HS400 */ unsigned int version; /* SDHCI spec. version */ |