git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' into for-linus-3.0
[pandora-kernel.git]
/
drivers
/
ata
/
pata_marvell.c
diff --git
a/drivers/ata/pata_marvell.c
b/drivers/ata/pata_marvell.c
index
75a6a0c
..
5d7f58a
100644
(file)
--- a/
drivers/ata/pata_marvell.c
+++ b/
drivers/ata/pata_marvell.c
@@
-161,6
+161,9
@@
static const struct pci_device_id marvell_pci_tbl[] = {
{ PCI_DEVICE(0x11AB, 0x6121), },
{ PCI_DEVICE(0x11AB, 0x6123), },
{ PCI_DEVICE(0x11AB, 0x6145), },
{ PCI_DEVICE(0x11AB, 0x6121), },
{ PCI_DEVICE(0x11AB, 0x6123), },
{ PCI_DEVICE(0x11AB, 0x6145), },
+ { PCI_DEVICE(0x1B4B, 0x91A0), },
+ { PCI_DEVICE(0x1B4B, 0x91A4), },
+
{ } /* terminate list */
};
{ } /* terminate list */
};