diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 23:21:22 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 23:21:22 (GMT) |
commit | 17be03f0a1f42ccfccb38f7d0a94c0f0169634a6 (patch) | |
tree | 8fe4fc7a987547c546e7b493eecb3607a9583795 /include/linux | |
parent | cce0cac125623f9b68f25dd1350f6d616220a8dd (diff) | |
parent | 85d1494e5ff8e20a52ce514584ffda4f0265025e (diff) | |
download | linux-fsl-qoriq-17be03f0a1f42ccfccb38f7d0a94c0f0169634a6.tar.xz |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/pci_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 92a619b..7a61ccd 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1832,6 +1832,7 @@ #define PCI_VENDOR_ID_AFAVLAB 0x14db #define PCI_DEVICE_ID_AFAVLAB_P028 0x2180 #define PCI_DEVICE_ID_AFAVLAB_P030 0x2182 +#define PCI_SUBDEVICE_ID_AFAVLAB_P061 0x2150 #define PCI_VENDOR_ID_BROADCOM 0x14e4 #define PCI_DEVICE_ID_TIGON3_5752 0x1600 |