diff options
| author | Greg Kroah-Hartman | 2011-11-27 05:07:25 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-11-27 05:07:25 +0100 |
| commit | dd7c7c3f69291baa488b8a50db683d5fbf44166a (patch) | |
| tree | 925bf294f30dffaa67a983c3859926ff53937e14 /include/linux/pci_ids.h | |
| parent | UART: add CSR SiRFprimaII SoC on-chip uart drivers (diff) | |
| parent | Linux 3.2-rc3 (diff) | |
| download | kernel-qcow2-linux-dd7c7c3f69291baa488b8a50db683d5fbf44166a.tar.gz kernel-qcow2-linux-dd7c7c3f69291baa488b8a50db683d5fbf44166a.tar.xz kernel-qcow2-linux-dd7c7c3f69291baa488b8a50db683d5fbf44166a.zip | |
Merge 3.2-rc3 into tty-next to handle merge conflict in tty_ldisc.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 @@ #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 |