aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mtd/nand/cafe_nand.c6
-rw-r--r--include/linux/pci_ids.h1
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index 95345d051579..b8064bf3aee4 100644
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -1,6 +1,9 @@
1/* 1/*
2 * Driver for One Laptop Per Child ‘CAFÉ’ controller, aka Marvell 88ALP01 2 * Driver for One Laptop Per Child ‘CAFÉ’ controller, aka Marvell 88ALP01
3 * 3 *
4 * The data sheet for this device can be found at:
5 * http://www.marvell.com/products/pcconn/88ALP01.jsp
6 *
4 * Copyright © 2006 Red Hat, Inc. 7 * Copyright © 2006 Red Hat, Inc.
5 * Copyright © 2006 David Woodhouse <dwmw2@infradead.org> 8 * Copyright © 2006 David Woodhouse <dwmw2@infradead.org>
6 */ 9 */
@@ -842,7 +845,8 @@ static void __devexit cafe_nand_remove(struct pci_dev *pdev)
842} 845}
843 846
844static struct pci_device_id cafe_nand_tbl[] = { 847static struct pci_device_id cafe_nand_tbl[] = {
845 { 0x11ab, 0x4100, PCI_ANY_ID, PCI_ANY_ID }, 848 { PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_88ALP01_NAND,
849 PCI_ANY_ID, PCI_ANY_ID },
846 { } 850 { }
847}; 851};
848 852
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index ef6ef64beb53..e6240b7cb404 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1521,6 +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_88ALP01_NAND 0x4100
1524#define PCI_DEVICE_ID_MARVELL_88ALP01_SD 0x4101 1525#define PCI_DEVICE_ID_MARVELL_88ALP01_SD 0x4101
1525 1526
1526#define PCI_VENDOR_ID_V3 0x11b0 1527#define PCI_VENDOR_ID_V3 0x11b0