diff options
| author | Linus Torvalds | 2011-11-12 02:55:01 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2011-11-12 02:55:01 +0100 |
| commit | 87618e0003dbca0f51f1ef52fa4199bd65212f41 (patch) | |
| tree | d814cfe3675352bea6133518b7d93d7052048ece /include/linux | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff) | |
| parent | pata_of_platform: Don't use NO_IRQ (diff) | |
| download | kernel-qcow2-linux-87618e0003dbca0f51f1ef52fa4199bd65212f41.tar.gz kernel-qcow2-linux-87618e0003dbca0f51f1ef52fa4199bd65212f41.tar.xz kernel-qcow2-linux-87618e0003dbca0f51f1ef52fa4199bd65212f41.zip | |
Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
* 'upstream-linus' of git://github.com/jgarzik/libata-dev:
pata_of_platform: Don't use NO_IRQ
[libata] ahci: Add ASMedia ASM1061 support
[libata] Issue SRST to Sil3726 PMP
sata_sis.c: trivial spelling fix
ahci_platform: use dev_get_platdata()
[libata] libata-scsi.c: Add function parameter documentation
Diffstat (limited to 'include/linux')
| -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 |