diff options
Diffstat (limited to 'drivers/mmc/host/sdhci-pci.c')
-rw-r--r-- | drivers/mmc/host/sdhci-pci.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index 0dc905b20eee..2f8d46854acd 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c | |||
@@ -547,6 +547,14 @@ static const struct pci_device_id pci_ids[] __devinitdata = { | |||
547 | }, | 547 | }, |
548 | 548 | ||
549 | { | 549 | { |
550 | .vendor = PCI_VENDOR_ID_RICOH, | ||
551 | .device = 0xe823, | ||
552 | .subvendor = PCI_ANY_ID, | ||
553 | .subdevice = PCI_ANY_ID, | ||
554 | .driver_data = (kernel_ulong_t)&sdhci_ricoh_mmc, | ||
555 | }, | ||
556 | |||
557 | { | ||
550 | .vendor = PCI_VENDOR_ID_ENE, | 558 | .vendor = PCI_VENDOR_ID_ENE, |
551 | .device = PCI_DEVICE_ID_ENE_CB712_SD, | 559 | .device = PCI_DEVICE_ID_ENE_CB712_SD, |
552 | .subvendor = PCI_ANY_ID, | 560 | .subvendor = PCI_ANY_ID, |
@@ -900,9 +908,6 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot( | |||
900 | { | 908 | { |
901 | struct sdhci_pci_slot *slot; | 909 | struct sdhci_pci_slot *slot; |
902 | struct sdhci_host *host; | 910 | struct sdhci_host *host; |
903 | |||
904 | resource_size_t addr; | ||
905 | |||
906 | int ret; | 911 | int ret; |
907 | 912 | ||
908 | if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) { | 913 | if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) { |
@@ -949,7 +954,6 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot( | |||
949 | goto free; | 954 | goto free; |
950 | } | 955 | } |
951 | 956 | ||
952 | addr = pci_resource_start(pdev, bar); | ||
953 | host->ioaddr = pci_ioremap_bar(pdev, bar); | 957 | host->ioaddr = pci_ioremap_bar(pdev, bar); |
954 | if (!host->ioaddr) { | 958 | if (!host->ioaddr) { |
955 | dev_err(&pdev->dev, "failed to remap registers\n"); | 959 | dev_err(&pdev->dev, "failed to remap registers\n"); |