diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-30 08:49:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-30 08:49:20 -0800 |
| commit | f8e988436b9d83b20bc5cc378f1a8034816ae6a6 (patch) | |
| tree | 5250d6b520ad9552a6fe14ac149ed0d7da329905 /include/linux | |
| parent | c801147c5a103eec864afee348c4ee3fdb0f380c (diff) | |
| parent | 8926bfa7462d4c3f8b05cca929e0c4bcde93ae38 (diff) | |
| download | op-kernel-dev-f8e988436b9d83b20bc5cc378f1a8034816ae6a6.zip op-kernel-dev-f8e988436b9d83b20bc5cc378f1a8034816ae6a6.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 1e737e2..53e3293 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -387,7 +387,6 @@ #define PCI_DEVICE_ID_NS_SC1100_SMI 0x0511 #define PCI_DEVICE_ID_NS_SC1100_XBUS 0x0515 #define PCI_DEVICE_ID_NS_87410 0xd001 -#define PCI_DEVICE_ID_NS_CS5535_IDE 0x002d #define PCI_VENDOR_ID_TSENG 0x100c #define PCI_DEVICE_ID_TSENG_W32P_2 0x3202 @@ -489,8 +488,6 @@ #define PCI_DEVICE_ID_AMD_8151_0 0x7454 #define PCI_DEVICE_ID_AMD_8131_APIC 0x7450 -#define PCI_DEVICE_ID_AMD_CS5536_IDE 0x209A - #define PCI_VENDOR_ID_TRIDENT 0x1023 #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000 #define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001 |
