Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / drivers / mmc / host / sdhci-pci.h

diff --git a/drivers/mmc/host/sdhci-pci.h b/drivers/mmc/host/sdhci-pci.h
index 4abdaed72bd481b9195a42d0ead707c02227b7fa..36f743464fcceded6afa7fcb0aaf8e7f26c1440c 100644 (file)
--- a/drivers/mmc/host/sdhci-pci.h
+++ b/drivers/mmc/host/sdhci-pci.h
@@ -81,7 +81,6 @@ struct sdhci_pci_slot {
        int                     cd_gpio;
        int                     cd_irq;
 
-       char                    *cd_con_id;
        int                     cd_idx;
        bool                    cd_override_level;