diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2008-09-03 04:45:57 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-09-04 04:45:34 -0400 |
commit | 8c5eb880585a6fa278aa49553dd53a25e1ac319d (patch) | |
tree | 8beed2cabd9655be1c0dd4e864065358f8294209 | |
parent | dc8e19094872cc4c9449268a44cbc2b99654840d (diff) |
Use PCI_DEVICE_ID_88ALP01 for CAFÉ chip, rather than PCI_DEVICE_ID_CAFE.
Probably better to use the official designation.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Acked-by: Pierre Ossman <drzeus@drzeus.cx>
-rw-r--r-- | drivers/mmc/host/sdhci-pci.c | 2 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index fcb14c2346cc..0341cfbd6fc4 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c | |||
@@ -326,7 +326,7 @@ static const struct pci_device_id pci_ids[] __devinitdata = { | |||
326 | 326 | ||
327 | { | 327 | { |
328 | .vendor = PCI_VENDOR_ID_MARVELL, | 328 | .vendor = PCI_VENDOR_ID_MARVELL, |
329 | .device = PCI_DEVICE_ID_MARVELL_CAFE_SD, | 329 | .device = PCI_DEVICE_ID_MARVELL_88ALP01_SD, |
330 | .subvendor = PCI_ANY_ID, | 330 | .subvendor = PCI_ANY_ID, |
331 | .subdevice = PCI_ANY_ID, | 331 | .subdevice = PCI_ANY_ID, |
332 | .driver_data = (kernel_ulong_t)&sdhci_cafe, | 332 | .driver_data = (kernel_ulong_t)&sdhci_cafe, |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index f1624b396754..ef6ef64beb53 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -1521,7 +1521,7 @@ | |||
1521 | #define PCI_DEVICE_ID_MARVELL_GT64260 0x6430 | 1521 | #define PCI_DEVICE_ID_MARVELL_GT64260 0x6430 |
1522 | #define PCI_DEVICE_ID_MARVELL_MV64360 0x6460 | 1522 | #define PCI_DEVICE_ID_MARVELL_MV64360 0x6460 |
1523 | #define PCI_DEVICE_ID_MARVELL_MV64460 0x6480 | 1523 | #define PCI_DEVICE_ID_MARVELL_MV64460 0x6480 |
1524 | #define PCI_DEVICE_ID_MARVELL_CAFE_SD 0x4101 | 1524 | #define PCI_DEVICE_ID_MARVELL_88ALP01_SD 0x4101 |
1525 | 1525 | ||
1526 | #define PCI_VENDOR_ID_V3 0x11b0 | 1526 | #define PCI_VENDOR_ID_V3 0x11b0 |
1527 | #define PCI_DEVICE_ID_V3_V960 0x0001 | 1527 | #define PCI_DEVICE_ID_V3_V960 0x0001 |