diff options
author | Greg Kroah-Hartman | 2011-11-27 04:46:19 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2011-11-27 04:46:48 +0100 |
commit | 47b649590dbbea182f854d6470ee1cd59b7b7684 (patch) | |
tree | a2de3610f9c5e963234cffb35b9d559aab62e164 /include/linux/pci_ids.h | |
parent | usb: Netlogic: Use CPU_XLR in place of NLM_XLR (diff) | |
parent | Linux 3.2-rc3 (diff) | |
download | kernel-qcow2-linux-47b649590dbbea182f854d6470ee1cd59b7b7684.tar.gz kernel-qcow2-linux-47b649590dbbea182f854d6470ee1cd59b7b7684.tar.xz kernel-qcow2-linux-47b649590dbbea182f854d6470ee1cd59b7b7684.zip |
Merge 3.2-rc3 into usb-linus
This pulls in the latest USB bugfixes and helps a few of the drivers
merge nicer in the future due to changes in both branches.
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 |