diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-04 14:14:42 +0100 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-04 14:14:42 +0100 |
commit | 07929dcb963786512c760dd3ecd148d89295e7e5 (patch) | |
tree | f5db01392ebb968b4c8acb5a6b3b03a833bfcb02 /include/linux/pci_ids.h | |
parent | c2d9b8387bce8b4a0fd402fab7dc1319d11a418d (diff) | |
parent | 19f7241a3b087bbf4dd107c979608fdb56c83a09 (diff) | |
download | kernel_samsung_aries-07929dcb963786512c760dd3ecd148d89295e7e5.zip kernel_samsung_aries-07929dcb963786512c760dd3ecd148d89295e7e5.tar.gz kernel_samsung_aries-07929dcb963786512c760dd3ecd148d89295e7e5.tar.bz2 |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'include/linux/pci_ids.h')
-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 c3ee1ae..27348c2 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1238,6 +1238,7 @@ #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE 0x0265 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA 0x0266 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2 0x0267 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE 0x036E #define PCI_DEVICE_ID_NVIDIA_NVENET_12 0x0268 #define PCI_DEVICE_ID_NVIDIA_NVENET_13 0x0269 #define PCI_DEVICE_ID_NVIDIA_MCP51_AUDIO 0x026B |