diff options
| author | Jani Nikula | 2018-11-20 12:14:08 +0100 |
|---|---|---|
| committer | Jani Nikula | 2018-11-20 12:14:08 +0100 |
| commit | 2ac5e38ea4203852d6e99edd3cf11f044b0a409f (patch) | |
| tree | 1ef02da98d56309368ad2b6a4e492bafe5bb4faf /include/linux/platform_data/pxa_sdhci.h | |
| parent | drm/i915/fixed: cosmetic cleanup (diff) | |
| parent | Merge branch 'drm-next-4.21' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
| download | kernel-qcow2-linux-2ac5e38ea4203852d6e99edd3cf11f044b0a409f.tar.gz kernel-qcow2-linux-2ac5e38ea4203852d6e99edd3cf11f044b0a409f.tar.xz kernel-qcow2-linux-2ac5e38ea4203852d6e99edd3cf11f044b0a409f.zip | |
Merge drm/drm-next into drm-intel-next-queued
Pull in v4.20-rc3 via drm-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/linux/platform_data/pxa_sdhci.h')
| -rw-r--r-- | include/linux/platform_data/pxa_sdhci.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/platform_data/pxa_sdhci.h b/include/linux/platform_data/pxa_sdhci.h index 9e20c2fb4ffd..4977c06d8a86 100644 --- a/include/linux/platform_data/pxa_sdhci.h +++ b/include/linux/platform_data/pxa_sdhci.h @@ -33,8 +33,6 @@ * 1: choose feedback clk + delay value * 2: choose internal clk * @clk_delay_enable: enable clk_delay or not, used on pxa910 - * @ext_cd_gpio: gpio pin used for external CD line - * @ext_cd_gpio_invert: invert values for external CD gpio line * @max_speed: the maximum speed supported * @host_caps: Standard MMC host capabilities bit field. * @quirks: quirks of platfrom @@ -46,8 +44,6 @@ struct sdhci_pxa_platdata { unsigned int clk_delay_cycles; unsigned int clk_delay_sel; bool clk_delay_enable; - unsigned int ext_cd_gpio; - bool ext_cd_gpio_invert; unsigned int max_speed; u32 host_caps; u32 host_caps2; |