diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-11-24 03:34:03 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-11-24 03:34:03 -0500 |
| commit | 17f0056e6a2f3d1818801705f5e12b71217bf4ef (patch) | |
| tree | fe6fa1c0b92c43804a31b443ce4b5159d4d0ce13 /include/linux/pci_ids.h | |
| parent | f87114e982cf3b657411e2df50e4e42ec1f162dd (diff) | |
| parent | be09d1dcf21eb3121bed3ee4dadacdea1805d7f8 (diff) | |
Merge branch 'rmobile-fixes-for-linus' into rmobile-latest
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 3fdf251389de..172ba70306d1 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2405,6 +2405,8 @@ | |||
| 2405 | 2405 | ||
| 2406 | #define PCI_VENDOR_ID_AZWAVE 0x1a3b | 2406 | #define PCI_VENDOR_ID_AZWAVE 0x1a3b |
| 2407 | 2407 | ||
| 2408 | #define PCI_VENDOR_ID_ASMEDIA 0x1b21 | ||
| 2409 | |||
| 2408 | #define PCI_VENDOR_ID_TEKRAM 0x1de1 | 2410 | #define PCI_VENDOR_ID_TEKRAM 0x1de1 |
| 2409 | #define PCI_DEVICE_ID_TEKRAM_DC290 0xdc29 | 2411 | #define PCI_DEVICE_ID_TEKRAM_DC290 0xdc29 |
| 2410 | 2412 | ||