regen

2 files changed, 179 insertions, 179 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index e7f8fd1bca9..5d0526ab3ca 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.1412 2008/09/17 05:29:25 brad Exp 
+ *	OpenBSD: pcidevs,v 1.1413 2008/09/17 05:54:48 brad Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -850,67 +850,67 @@
 #define	PCI_PRODUCT_ATI_R200_BB	0x4242		/* Radeon 8500 BB */
 #define	PCI_PRODUCT_ATI_RADEON_IGP320M	0x4336		/* Radeon IGP 320M */
 #define	PCI_PRODUCT_ATI_MOBILITY_M6	0x4337		/* Mobility M6 */
-#define	PCI_PRODUCT_ATI_IXP_AUDIO_200	0x4341		/* IXP200 AC97 */
-#define	PCI_PRODUCT_ATI_IXP_PCI_200	0x4342		/* IXP200 PCI */
-#define	PCI_PRODUCT_ATI_IXP_EHCI_200	0x4345		/* IXP200 USB2 */
-#define	PCI_PRODUCT_ATI_IXP_OHCI_200_1	0x4347		/* IXP200 USB */
-#define	PCI_PRODUCT_ATI_IXP_OHCI_200_2	0x4348		/* IXP200 USB */
-#define	PCI_PRODUCT_ATI_IXP_IDE_200	0x4349		/* IXP200 IDE */
-#define	PCI_PRODUCT_ATI_IXP_ISA_200	0x434c		/* IXP200 ISA */
-#define	PCI_PRODUCT_ATI_IXP_MODEM_200	0x434d		/* IXP200 Modem */
-#define	PCI_PRODUCT_ATI_IXP_SMB_200	0x4353		/* IXP200 SMBus */
+#define	PCI_PRODUCT_ATI_SB200_AUDIO	0x4341		/* SB200 AC97 */
+#define	PCI_PRODUCT_ATI_SB200_PCI	0x4342		/* SB200 PCI */
+#define	PCI_PRODUCT_ATI_SB200_EHCI	0x4345		/* SB200 USB2 */
+#define	PCI_PRODUCT_ATI_SB200_OHCI_1	0x4347		/* SB200 USB */
+#define	PCI_PRODUCT_ATI_SB200_OHCI_2	0x4348		/* SB200 USB */
+#define	PCI_PRODUCT_ATI_SB200_IDE	0x4349		/* SB200 IDE */
+#define	PCI_PRODUCT_ATI_SB200_ISA	0x434c		/* SB200 ISA */
+#define	PCI_PRODUCT_ATI_SB200_MODEM	0x434d		/* SB200 Modem */
+#define	PCI_PRODUCT_ATI_SB200_SMB	0x4353		/* SB200 SMBus */
 #define	PCI_PRODUCT_ATI_MACH64_CT	0x4354		/* Mach64 CT */
 #define	PCI_PRODUCT_ATI_MACH64_CX	0x4358		/* Mach64 CX */
-#define	PCI_PRODUCT_ATI_IXP_AUDIO_300	0x4361		/* IXP300 AC97 */
-#define	PCI_PRODUCT_ATI_IXP_PCI_300	0x4362		/* IXP300 PCI */
-#define	PCI_PRODUCT_ATI_IXP_SMB_300	0x4363		/* IXP300 SMBus */
-#define	PCI_PRODUCT_ATI_IXP_EHCI_300	0x3265		/* IXP300 USB2 */
-#define	PCI_PRODUCT_ATI_IXP_OHCI_300_1	0x4367		/* IXP300 USB */
-#define	PCI_PRODUCT_ATI_IXP_OHCI_300_2	0x4368		/* IXP300 USB */
-#define	PCI_PRODUCT_ATI_IXP_IDE_300	0x4369		/* IXP300 IDE */
-#define	PCI_PRODUCT_ATI_IXP_ISA_300	0x436c		/* IXP300 ISA */
-#define	PCI_PRODUCT_ATI_IXP_MODEM_300	0x436d		/* IXP300 Modem */
-#define	PCI_PRODUCT_ATI_IXP_SATA_300	0x436e		/* IXP300 SATA */
-#define	PCI_PRODUCT_ATI_IXP_AUDIO_400	0x4370		/* IXP400 AC97 */
-#define	PCI_PRODUCT_ATI_IXP_PCI_400	0x4371		/* IXP400 PCI */
-#define	PCI_PRODUCT_ATI_IXP_SMB_400	0x4372		/* IXP400 SMBus */
-#define	PCI_PRODUCT_ATI_IXP_EHCI_400	0x4373		/* IXP400 USB2 */
-#define	PCI_PRODUCT_ATI_IXP_OHCI_400_1	0x4374		/* IXP400 USB */
-#define	PCI_PRODUCT_ATI_IXP_OHCI_400_2	0x4375		/* IXP400 USB */
-#define	PCI_PRODUCT_ATI_IXP_IDE_400	0x4376		/* IXP400 IDE */
-#define	PCI_PRODUCT_ATI_IXP_ISA_400	0x4377		/* IXP400 ISA */
-#define	PCI_PRODUCT_ATI_IXP_MODEM_400	0x4378		/* IXP400 Modem */
-#define	PCI_PRODUCT_ATI_IXP_SATA_400_1	0x4379		/* IXP400 SATA */
-#define	PCI_PRODUCT_ATI_IXP_SATA_400_2	0x437a		/* IXP400 SATA */
-#define	PCI_PRODUCT_ATI_IXP_HDA_450	0x437b		/* IXP450 HD Audio */
-#define	PCI_PRODUCT_ATI_IXP_SATA_600	0x4380		/* IXP600 SATA */
-#define	PCI_PRODUCT_ATI_IXP_AUDIO_600	0x4382		/* IXP600 AC97 */
-#define	PCI_PRODUCT_ATI_IXP_HDA_X00	0x4383		/* IXPx00 HD Audio */
-#define	PCI_PRODUCT_ATI_IXP_PCI_600	0x4384		/* IXP600 PCI */
-#define	PCI_PRODUCT_ATI_IXP_SMB_X00	0x4385		/* IXPx00 SMBus */
-#define	PCI_PRODUCT_ATI_IXP_EHCI_600	0x4386		/* IXP600 USB2 */
-#define	PCI_PRODUCT_ATI_IXP_OHCI_600_1	0x4387		/* IXP600 USB */
-#define	PCI_PRODUCT_ATI_IXP_OHCI_600_2	0x4388		/* IXP600 USB */
-#define	PCI_PRODUCT_ATI_IXP_OHCI_600_3	0x4389		/* IXP600 USB */
-#define	PCI_PRODUCT_ATI_IXP_OHCI_600_4	0x438a		/* IXP600 USB */
-#define	PCI_PRODUCT_ATI_IXP_OHCI_600_5	0x438b		/* IXP600 USB */
-#define	PCI_PRODUCT_ATI_IXP_IDE_600	0x438c		/* IXP600 IDE */
-#define	PCI_PRODUCT_ATI_IXP_ISA_600	0x438d		/* IXP600 ISA */
-#define	PCI_PRODUCT_ATI_IXP_MODEM_600	0x438e		/* IXP600 Modem */
-#define	PCI_PRODUCT_ATI_IXP_SATA_X00_1	0x4390		/* IXPx00 SATA */
-#define	PCI_PRODUCT_ATI_IXP_SATA_X00_2	0x4391		/* IXPx00 SATA */
-#define	PCI_PRODUCT_ATI_IXP_SATA_X00_3	0x4392		/* IXPx00 SATA */
-#define	PCI_PRODUCT_ATI_IXP_SATA_X00_4	0x4393		/* IXPx00 SATA */
-#define	PCI_PRODUCT_ATI_IXP_SATA_X00_5	0x4394		/* IXPx00 SATA */
-#define	PCI_PRODUCT_ATI_IXP_SATA_X00_6	0x4395		/* IXPx00 SATA */
-#define	PCI_PRODUCT_ATI_IXP_EHCI_700	0x4396		/* IXP700 USB2 */
-#define	PCI_PRODUCT_ATI_IXP_OHCI_700_1	0x4397		/* IXP700 USB */
-#define	PCI_PRODUCT_ATI_IXP_OHCI_700_2	0x4398		/* IXP700 USB */
-#define	PCI_PRODUCT_ATI_IXP_OHCI_700_3	0x4399		/* IXP700 USB */
-#define	PCI_PRODUCT_ATI_IXP_OHCI_700_4	0x439a		/* IXP700 USB */
-#define	PCI_PRODUCT_ATI_IXP_OHCI_700_5	0x439b		/* IXP700 USB */
-#define	PCI_PRODUCT_ATI_IXP_IDE_700	0x439c		/* IXP700 IDE */
-#define	PCI_PRODUCT_ATI_IXP_ISA_700	0x439d		/* IXP700 ISA */
+#define	PCI_PRODUCT_ATI_SB300_AUDIO	0x4361		/* SB300 AC97 */
+#define	PCI_PRODUCT_ATI_SB300_PCI	0x4362		/* SB300 PCI */
+#define	PCI_PRODUCT_ATI_SB300_SMB	0x4363		/* SB300 SMBus */
+#define	PCI_PRODUCT_ATI_SB300_EHCI	0x4365		/* SB300 USB2 */
+#define	PCI_PRODUCT_ATI_SB300_OHCI_1	0x4367		/* SB300 USB */
+#define	PCI_PRODUCT_ATI_SB300_OHCI_2	0x4368		/* SB300 USB */
+#define	PCI_PRODUCT_ATI_SB300_IDE	0x4369		/* SB300 IDE */
+#define	PCI_PRODUCT_ATI_SB300_ISA	0x436c		/* SB300 ISA */
+#define	PCI_PRODUCT_ATI_SB300_MODEM	0x436d		/* SB300 Modem */
+#define	PCI_PRODUCT_ATI_SB300_SATA	0x436e		/* SB300 SATA */
+#define	PCI_PRODUCT_ATI_SB400_AUDIO	0x4370		/* SB400 AC97 */
+#define	PCI_PRODUCT_ATI_SB400_PCI	0x4371		/* SB400 PCI */
+#define	PCI_PRODUCT_ATI_SB400_SMB	0x4372		/* SB400 SMBus */
+#define	PCI_PRODUCT_ATI_SB400_EHCI	0x4373		/* SB400 USB2 */
+#define	PCI_PRODUCT_ATI_SB400_OHCI_1	0x4374		/* SB400 USB */
+#define	PCI_PRODUCT_ATI_SB400_OHCI_2	0x4375		/* SB400 USB */
+#define	PCI_PRODUCT_ATI_SB400_IDE	0x4376		/* SB400 IDE */
+#define	PCI_PRODUCT_ATI_SB400_ISA	0x4377		/* SB400 ISA */
+#define	PCI_PRODUCT_ATI_SB400_MODEM	0x4378		/* SB400 Modem */
+#define	PCI_PRODUCT_ATI_SB400_SATA_1	0x4379		/* SB400 SATA */
+#define	PCI_PRODUCT_ATI_SB400_SATA_2	0x437a		/* SB400 SATA */
+#define	PCI_PRODUCT_ATI_SB450_HDA	0x437b		/* SB450 HD Audio */
+#define	PCI_PRODUCT_ATI_SB600_SATA	0x4380		/* SB600 SATA */
+#define	PCI_PRODUCT_ATI_SB600_AUDIO	0x4382		/* SB600 AC97 */
+#define	PCI_PRODUCT_ATI_SBX00_HDA	0x4383		/* SBx00 HD Audio */
+#define	PCI_PRODUCT_ATI_SB600_PCI	0x4384		/* SB600 PCI */
+#define	PCI_PRODUCT_ATI_SBX00_SMB	0x4385		/* SBx00 SMBus */
+#define	PCI_PRODUCT_ATI_SB600_EHCI	0x4386		/* SB600 USB2 */
+#define	PCI_PRODUCT_ATI_SB600_OHCI_1	0x4387		/* SB600 USB */
+#define	PCI_PRODUCT_ATI_SB600_OHCI_2	0x4388		/* SB600 USB */
+#define	PCI_PRODUCT_ATI_SB600_OHCI_3	0x4389		/* SB600 USB */
+#define	PCI_PRODUCT_ATI_SB600_OHCI_4	0x438a		/* SB600 USB */
+#define	PCI_PRODUCT_ATI_SB600_OHCI_5	0x438b		/* SB600 USB */
+#define	PCI_PRODUCT_ATI_SB600_IDE	0x438c		/* SB600 IDE */
+#define	PCI_PRODUCT_ATI_SB600_ISA	0x438d		/* SB600 ISA */
+#define	PCI_PRODUCT_ATI_SB600_MODEM	0x438e		/* SB600 Modem */
+#define	PCI_PRODUCT_ATI_SBX00_SATA_1	0x4390		/* SBx00 SATA */
+#define	PCI_PRODUCT_ATI_SBX00_SATA_2	0x4391		/* SBx00 SATA */
+#define	PCI_PRODUCT_ATI_SBX00_SATA_3	0x4392		/* SBx00 SATA */
+#define	PCI_PRODUCT_ATI_SBX00_SATA_4	0x4393		/* SBx00 SATA */
+#define	PCI_PRODUCT_ATI_SBX00_SATA_5	0x4394		/* SBx00 SATA */
+#define	PCI_PRODUCT_ATI_SBX00_SATA_6	0x4395		/* SBx00 SATA */
+#define	PCI_PRODUCT_ATI_SB700_EHCI	0x4396		/* SB700 USB2 */
+#define	PCI_PRODUCT_ATI_SB700_OHCI_1	0x4397		/* SB700 USB */
+#define	PCI_PRODUCT_ATI_SB700_OHCI_2	0x4398		/* SB700 USB */
+#define	PCI_PRODUCT_ATI_SB700_OHCI_3	0x4399		/* SB700 USB */
+#define	PCI_PRODUCT_ATI_SB700_OHCI_4	0x439a		/* SB700 USB */
+#define	PCI_PRODUCT_ATI_SB700_OHCI_5	0x439b		/* SB700 USB */
+#define	PCI_PRODUCT_ATI_SB700_IDE	0x439c		/* SB700 IDE */
+#define	PCI_PRODUCT_ATI_SB700_ISA	0x439d		/* SB700 ISA */
 #define	PCI_PRODUCT_ATI_MACH64_ET	0x4554		/* Mach64 ET */
 #define	PCI_PRODUCT_ATI_RAGEPRO	0x4742		/* Rage Pro */
 #define	PCI_PRODUCT_ATI_MACH64_GD	0x4744		/* Mach64 GD */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index c0540516d9a..be211ea0f50 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.1412 2008/09/17 05:29:25 brad Exp 
+ *	OpenBSD: pcidevs,v 1.1413 2008/09/17 05:54:48 brad Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -1800,40 +1800,40 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Mobility M6",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_AUDIO_200,
-	    "IXP200 AC97",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_AUDIO,
+	    "SB200 AC97",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_PCI_200,
-	    "IXP200 PCI",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_PCI,
+	    "SB200 PCI",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_EHCI_200,
-	    "IXP200 USB2",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_EHCI,
+	    "SB200 USB2",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_200_1,
-	    "IXP200 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_OHCI_1,
+	    "SB200 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_200_2,
-	    "IXP200 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_OHCI_2,
+	    "SB200 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_IDE_200,
-	    "IXP200 IDE",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_IDE,
+	    "SB200 IDE",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_ISA_200,
-	    "IXP200 ISA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_ISA,
+	    "SB200 ISA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_MODEM_200,
-	    "IXP200 Modem",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_MODEM,
+	    "SB200 Modem",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SMB_200,
-	    "IXP200 SMBus",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_SMB,
+	    "SB200 SMBus",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_CT,
@@ -1844,204 +1844,204 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Mach64 CX",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_AUDIO_300,
-	    "IXP300 AC97",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_AUDIO,
+	    "SB300 AC97",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_PCI_300,
-	    "IXP300 PCI",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_PCI,
+	    "SB300 PCI",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SMB_300,
-	    "IXP300 SMBus",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_SMB,
+	    "SB300 SMBus",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_EHCI_300,
-	    "IXP300 USB2",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_EHCI,
+	    "SB300 USB2",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_300_1,
-	    "IXP300 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_OHCI_1,
+	    "SB300 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_300_2,
-	    "IXP300 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_OHCI_2,
+	    "SB300 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_IDE_300,
-	    "IXP300 IDE",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_IDE,
+	    "SB300 IDE",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_ISA_300,
-	    "IXP300 ISA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_ISA,
+	    "SB300 ISA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_MODEM_300,
-	    "IXP300 Modem",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_MODEM,
+	    "SB300 Modem",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_300,
-	    "IXP300 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_SATA,
+	    "SB300 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_AUDIO_400,
-	    "IXP400 AC97",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_AUDIO,
+	    "SB400 AC97",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_PCI_400,
-	    "IXP400 PCI",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_PCI,
+	    "SB400 PCI",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SMB_400,
-	    "IXP400 SMBus",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_SMB,
+	    "SB400 SMBus",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_EHCI_400,
-	    "IXP400 USB2",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_EHCI,
+	    "SB400 USB2",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_400_1,
-	    "IXP400 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_OHCI_1,
+	    "SB400 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_400_2,
-	    "IXP400 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_OHCI_2,
+	    "SB400 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_IDE_400,
-	    "IXP400 IDE",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_IDE,
+	    "SB400 IDE",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_ISA_400,
-	    "IXP400 ISA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_ISA,
+	    "SB400 ISA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_MODEM_400,
-	    "IXP400 Modem",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_MODEM,
+	    "SB400 Modem",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_400_1,
-	    "IXP400 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_SATA_1,
+	    "SB400 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_400_2,
-	    "IXP400 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_SATA_2,
+	    "SB400 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_HDA_450,
-	    "IXP450 HD Audio",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB450_HDA,
+	    "SB450 HD Audio",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_600,
-	    "IXP600 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_SATA,
+	    "SB600 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_AUDIO_600,
-	    "IXP600 AC97",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_AUDIO,
+	    "SB600 AC97",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_HDA_X00,
-	    "IXPx00 HD Audio",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_HDA,
+	    "SBx00 HD Audio",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_PCI_600,
-	    "IXP600 PCI",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_PCI,
+	    "SB600 PCI",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SMB_X00,
-	    "IXPx00 SMBus",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_SMB,
+	    "SBx00 SMBus",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_EHCI_600,
-	    "IXP600 USB2",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_EHCI,
+	    "SB600 USB2",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_600_1,
-	    "IXP600 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_OHCI_1,
+	    "SB600 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_600_2,
-	    "IXP600 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_OHCI_2,
+	    "SB600 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_600_3,
-	    "IXP600 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_OHCI_3,
+	    "SB600 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_600_4,
-	    "IXP600 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_OHCI_4,
+	    "SB600 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_600_5,
-	    "IXP600 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_OHCI_5,
+	    "SB600 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_IDE_600,
-	    "IXP600 IDE",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_IDE,
+	    "SB600 IDE",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_ISA_600,
-	    "IXP600 ISA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_ISA,
+	    "SB600 ISA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_MODEM_600,
-	    "IXP600 Modem",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_MODEM,
+	    "SB600 Modem",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_X00_1,
-	    "IXPx00 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_SATA_1,
+	    "SBx00 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_X00_2,
-	    "IXPx00 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_SATA_2,
+	    "SBx00 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_X00_3,
-	    "IXPx00 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_SATA_3,
+	    "SBx00 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_X00_4,
-	    "IXPx00 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_SATA_4,
+	    "SBx00 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_X00_5,
-	    "IXPx00 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_SATA_5,
+	    "SBx00 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_X00_6,
-	    "IXPx00 SATA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_SATA_6,
+	    "SBx00 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_EHCI_700,
-	    "IXP700 USB2",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_EHCI,
+	    "SB700 USB2",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_700_1,
-	    "IXP700 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_OHCI_1,
+	    "SB700 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_700_2,
-	    "IXP700 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_OHCI_2,
+	    "SB700 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_700_3,
-	    "IXP700 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_OHCI_3,
+	    "SB700 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_700_4,
-	    "IXP700 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_OHCI_4,
+	    "SB700 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_OHCI_700_5,
-	    "IXP700 USB",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_OHCI_5,
+	    "SB700 USB",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_IDE_700,
-	    "IXP700 IDE",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_IDE,
+	    "SB700 IDE",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_ISA_700,
-	    "IXP700 ISA",
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_ISA,
+	    "SB700 ISA",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_ET,