GEODE: Update and fixup the PCI IDs for the CS5535

Jordan Crouse jordan.crouse at amd.com
Tue Nov 7 22:37:10 EST 2006


Commit:     cbd556651c8511cda7659a5580e1484ee3e66f0d
Parent:     427abfa28afedffadfca9dd8b067eb6d36bac53f
commit cbd556651c8511cda7659a5580e1484ee3e66f0d
Author:     Jordan Crouse <jordan.crouse at amd.com>
AuthorDate: Mon May 15 15:11:27 2006 -0600
Commit:     David Woodhouse <dwmw2 at infradead.org>
CommitDate: Mon Jun 19 16:23:02 2006 +0100

    GEODE: Update and fixup the PCI IDs for the CS5535
    
    Clean up redundant and poorly worded PCI IDs
    
    Signed-off-by:  Jordan Crouse <jordan.crouse at amd.com>
---
 drivers/video/geode/gxfb_core.c |    2 +-
 include/linux/pci_ids.h         |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index 89c34b1..7126ff5 100644
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -384,7 +384,7 @@ static void gxfb_remove(struct pci_dev *
 }
 
 static struct pci_device_id gxfb_id_table[] = {
-	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_VIDEO,
+	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_GX_VIDEO,
 	  PCI_ANY_ID, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY << 16,
 	  0xff0000, 0 },
 	{ 0, }
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 590dc6d..289a4f8 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -387,7 +387,7 @@ #define PCI_DEVICE_ID_NS_CS5535_ISA	0x00
 #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_DEVICE_ID_NS_GX_VIDEO	0x0030
 #define PCI_DEVICE_ID_NS_SATURN		0x0035
 #define PCI_DEVICE_ID_NS_SCx200_BRIDGE	0x0500
 #define PCI_DEVICE_ID_NS_SCx200_SMI	0x0501
@@ -400,8 +400,7 @@ #define PCI_DEVICE_ID_NS_SC1100_SMI	0x05
 #define PCI_DEVICE_ID_NS_SC1100_XBUS	0x0515
 #define PCI_DEVICE_ID_NS_87410		0xd001
 
-#define PCI_DEVICE_ID_NS_CS5535_HOST_BRIDGE  0x0028
-#define PCI_DEVICE_ID_NS_CS5535_ISA_BRIDGE   0x002b
+#define PCI_DEVICE_ID_NS_GX_HOST_BRIDGE  0x0028
 
 #define PCI_VENDOR_ID_TSENG		0x100c
 #define PCI_DEVICE_ID_TSENG_W32P_2	0x3202


More information about the Commits-kernel mailing list