From c3c0ff611ef9e05b6d1a5efa8b9ae9e1868474b1 Mon Sep 17 00:00:00 2001
From: Grant Coady <grant_lkml@dodo.com.au>
Date: Thu, 24 Nov 2005 20:41:06 +1100
Subject: [PATCH] --- yaml --- r: 14822 b: refs/heads/master c:
 c9d6073fb3cda856132dd544d537679f9715436c h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/pci_ids.h | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b696a8f45214..2cbec4adddfd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9632051963cb6e6f7412990f8b962209b9334e13
+refs/heads/master: c9d6073fb3cda856132dd544d537679f9715436c
diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h
index 1e737e269db9..53e3293051d4 100644
--- a/trunk/include/linux/pci_ids.h
+++ b/trunk/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