diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-02-13 15:03:34 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-02-13 15:03:58 +0700 |
| commit | 5f9dde0757e557d16685d29b21a6055025ec252e (patch) | |
| tree | 5f34dae1bcf94f1865c18ba9aced566abeb855b7 /include | |
| parent | 6b5ed324376aa451c3a51e367148da41c21ae36a (diff) | |
| parent | a96dbfbcb58afeec72c2a0a03d205e0e1457ea3d (diff) | |
| download | kernel_samsung_aries-5f9dde0757e557d16685d29b21a6055025ec252e.zip kernel_samsung_aries-5f9dde0757e557d16685d29b21a6055025ec252e.tar.gz kernel_samsung_aries-5f9dde0757e557d16685d29b21a6055025ec252e.tar.bz2 | |
Merge 3.0.63
Change-Id: I9a9716dcb833c128a649864690169473ec4739e1
Diffstat (limited to 'include')
| -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 f269c03..4c1a75f 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2390,6 +2390,8 @@ #define PCI_VENDOR_ID_AZWAVE 0x1a3b +#define PCI_VENDOR_ID_ASMEDIA 0x1b21 + #define PCI_VENDOR_ID_TEKRAM 0x1de1 #define PCI_DEVICE_ID_TEKRAM_DC290 0xdc29 |