[PATCH 1/3] Use PCI_DEVICE_ID_88ALP01 for CAFÉ chip, rather than PCI_DEVICE_ID_CAFE.

2008-09-03 Thread David Woodhouse 
Probably better to use the official designation.

Signed-off-by: David Woodhouse [EMAIL PROTECTED]
---
(Carried in git://git.infradead.org/~dwmw2/random-2.6.git)

 drivers/mmc/host/sdhci-pci.c |2 +-
 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 fcb14c2..0341cfb 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 = 
{
 
{
.vendor = PCI_VENDOR_ID_MARVELL,
-   .device = PCI_DEVICE_ID_MARVELL_CAFE_SD,
+   .device = PCI_DEVICE_ID_MARVELL_88ALP01_SD,
.subvendor  = PCI_ANY_ID,
.subdevice  = PCI_ANY_ID,
.driver_data= (kernel_ulong_t)sdhci_cafe,
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index f1624b3..ef6ef64 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1521,7 +1521,7 @@
 #define PCI_DEVICE_ID_MARVELL_GT64260  0x6430
 #define PCI_DEVICE_ID_MARVELL_MV64360  0x6460
 #define PCI_DEVICE_ID_MARVELL_MV64460  0x6480
-#define PCI_DEVICE_ID_MARVELL_CAFE_SD  0x4101
+#define PCI_DEVICE_ID_MARVELL_88ALP01_SD   0x4101
 
 #define PCI_VENDOR_ID_V3   0x11b0
 #define PCI_DEVICE_ID_V3_V960  0x0001
-- 
1.5.5.1
-- 
David WoodhouseOpen Source Technology Centre
[EMAIL PROTECTED]  Intel Corporation



___
Devel mailing list
Devel@lists.laptop.org
http://lists.laptop.org/listinfo/devel

Re: [PATCH 1/3] Use PCI_DEVICE_ID_88ALP01 for CAFÉ chip, rather than PCI_DEVICE_ID_CAFE.

2008-09-03 Thread Pierre Ossman 
On Wed, 03 Sep 2008 11:48:17 +0100
David Woodhouse [EMAIL PROTECTED] wrote:

 Probably better to use the official designation.
 
 Signed-off-by: David Woodhouse [EMAIL PROTECTED]
 ---

No objection here.

Acked-by: Pierre Ossman [EMAIL PROTECTED]

-- 
 -- Pierre Ossman

  WARNING: This correspondence is being monitored by the
  Swedish government. Make sure your server uses encryption
  for SMTP traffic and consider using PGP for end-to-end
  encryption.


signature.asc
Description: PGP signature
___
Devel mailing list
Devel@lists.laptop.org
http://lists.laptop.org/listinfo/devel