mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-13 16:16:15 -04:00
Merge branch 'upstream-fixes' into upstream
This commit is contained in:
commit
e36fcd8ae6
1 changed files with 7 additions and 0 deletions
|
|
@ -269,8 +269,15 @@ static const struct pci_device_id pdc_ata_pci_tbl[] = {
|
|||
{ PCI_VENDOR_ID_PROMISE, 0x6629, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
board_20619 },
|
||||
|
||||
/* TODO: remove all associated board_20771 code, as it completely
|
||||
* duplicates board_2037x code, unless reason for separation can be
|
||||
* divined.
|
||||
*/
|
||||
#if 0
|
||||
{ PCI_VENDOR_ID_PROMISE, 0x3570, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
board_20771 },
|
||||
#endif
|
||||
|
||||
{ } /* terminate list */
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue