From de487c1c173826cb87d9b8120e0c5e6958b41027 Mon Sep 17 00:00:00 2001 From: Grant Coady Date: Sun, 15 Jan 2006 16:21:27 +1100 Subject: [PATCH] --- yaml --- r: 19247 b: refs/heads/master c: 2181c971952ec2af56cd9cc68453f7ad5a0a38d6 h: refs/heads/master i: 19245: fe17e1d0f7e0523387c02381cf83c572171e1c59 19243: 3f230fe9ebe1f30728059378cbc602ef20f13a68 19239: 41c6b4fe1ce99bb956e9305edbafb293a1383003 19231: 8536c2b88ab7372bfb95e99525b9be346dfa6282 v: v3 --- [refs] | 2 +- trunk/include/linux/pci_ids.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 1b372d8eacfb..9ee2e9e9673f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8cea8e9303d45556cb606cc8d9e41f889ff600c0 +refs/heads/master: 2181c971952ec2af56cd9cc68453f7ad5a0a38d6 diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index 7868a8ed1906..b0b908f583c5 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -394,14 +394,9 @@ #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_DEVICE_ID_NS_CS5535_HOST_BRIDGE 0x0028 #define PCI_DEVICE_ID_NS_CS5535_ISA_BRIDGE 0x002b -#define PCI_DEVICE_ID_NS_CS5535_IDE 0x002d -#define PCI_DEVICE_ID_NS_CS5535_AUDIO 0x002e -#define PCI_DEVICE_ID_NS_CS5535_USB 0x002f -#define PCI_DEVICE_ID_NS_CS5535_VIDEO 0x0030 #define PCI_VENDOR_ID_TSENG 0x100c #define PCI_DEVICE_ID_TSENG_W32P_2 0x3202 @@ -511,8 +506,6 @@ #define PCI_DEVICE_ID_AMD_CS5536_UOC 0x2097 #define PCI_DEVICE_ID_AMD_CS5536_IDE 0x209A -#define PCI_DEVICE_ID_AMD_CS5536_IDE 0x209A - #define PCI_DEVICE_ID_AMD_LX_VIDEO 0x2081 #define PCI_DEVICE_ID_AMD_LX_AES 0x2082