diff options
| author | Paul Mackerras | 2007-09-20 02:09:27 +0200 |
|---|---|---|
| committer | Paul Mackerras | 2007-09-20 02:09:27 +0200 |
| commit | 0ce49a3945474fc942ec37c0c0efece60f592f80 (patch) | |
| tree | f42b821b2d9e2d8775bc22f56d444c2cc7b7b7dd /drivers/mtd | |
| parent | [POWERPC] FWNMI is only used on pSeries (diff) | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| download | kernel-qcow2-linux-0ce49a3945474fc942ec37c0c0efece60f592f80.tar.gz kernel-qcow2-linux-0ce49a3945474fc942ec37c0c0efece60f592f80.tar.xz kernel-qcow2-linux-0ce49a3945474fc942ec37c0c0efece60f592f80.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/cafe_nand.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c index cff969d05d4a..6f32a35eb106 100644 --- a/drivers/mtd/nand/cafe_nand.c +++ b/drivers/mtd/nand/cafe_nand.c @@ -816,7 +816,8 @@ static void __devexit cafe_nand_remove(struct pci_dev *pdev) } static struct pci_device_id cafe_nand_tbl[] = { - { 0x11ab, 0x4100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MEMORY_FLASH << 8, 0xFFFF0 } + { 0x11ab, 0x4100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MEMORY_FLASH << 8, 0xFFFF0 }, + { 0, } }; MODULE_DEVICE_TABLE(pci, cafe_nand_tbl); |