diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-09 01:15:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-09 01:15:11 -0800 |
| commit | 509b994a1dc0e4ae143355071e1bfc4411ac12bf (patch) | |
| tree | 7e0dd206f2fd7bdc23689dce3fb6f094e57e6239 /include/linux | |
| parent | 509224bff58976b324276a70ee59a396b431c84a (diff) | |
| parent | d9922d49975b818a40b0e721fd4ea513bb950a76 (diff) | |
Merge bk://kernel.bkbits.net/gregkh/linux/2.6.11/tpm
into ppc970.osdl.org:/home/torvalds/v2.6/linux
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 a0bf80e45aee..267225831bc2 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -519,6 +519,7 @@ #define PCI_DEVICE_ID_AMD_OPUS_7449 0x7449 # define PCI_DEVICE_ID_AMD_VIPER_7449 PCI_DEVICE_ID_AMD_OPUS_7449 #define PCI_DEVICE_ID_AMD_8111_LAN 0x7462 +#define PCI_DEVICE_ID_AMD_8111_LPC 0x7468 #define PCI_DEVICE_ID_AMD_8111_IDE 0x7469 #define PCI_DEVICE_ID_AMD_8111_SMBUS2 0x746a #define PCI_DEVICE_ID_AMD_8111_SMBUS 0x746b |