diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-16 13:19:15 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-16 13:19:15 +1000 |
| commit | 531651b41ffdba2099766fe22db96dfa53ef63a4 (patch) | |
| tree | 748654361bc93e07088c9074d274576ffa819b96 /drivers/mmc/host/dw_mmc.h | |
| parent | b1abb8068c7faed87c7c66505a1b9031c660125d (diff) | |
| parent | 197160d52e859575ff0ad1afd674ab2a825b9f83 (diff) | |
Merge remote-tracking branch 'mmc/mmc-next'
Diffstat (limited to 'drivers/mmc/host/dw_mmc.h')
| -rw-r--r-- | drivers/mmc/host/dw_mmc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h index 68349779c396..738fa241d058 100644 --- a/drivers/mmc/host/dw_mmc.h +++ b/drivers/mmc/host/dw_mmc.h @@ -195,7 +195,6 @@ extern int dw_mci_resume(struct dw_mci *host); * @mmc: The mmc_host representing this slot. * @host: The MMC controller this slot is using. * @quirks: Slot-level quirks (DW_MCI_SLOT_QUIRK_XXX) - * @wp_gpio: If gpio_is_valid() we'll use this to read write protect. * @ctype: Card type for this slot. * @mrq: mmc_request currently being processed or waiting to be * processed, or NULL when the slot is idle. @@ -214,7 +213,6 @@ struct dw_mci_slot { struct dw_mci *host; int quirks; - int wp_gpio; u32 ctype; |