sort intel devices and kill dups.

please keep device list sorted, this prevents you from creating
duplicate entries mistakenly.

1 files changed, 13 insertions, 16 deletions

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 899e2bbb144..edf001fbf37 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.797 2004/11/20 23:20:10 brad Exp $
+$OpenBSD: pcidevs,v 1.798 2004/11/21 08:37:53 grange Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
 /*
@@ -1215,8 +1215,8 @@ product INITIO INIC950		0x9500	INIC-950
 product IMS 8849		0x8849	8849
 
 /* Intel products */
-product INTEL 21145		0x0039	21145
 product INTEL EESISA		0x0008	EES ISA
+product INTEL 21145		0x0039	21145
 product INTEL 80312		0x030d	80312 I/O Companion
 product INTEL E7710_PXH_HUB_A	0x0329	PCIE-PCIX Bridge Hub A
 product INTEL E7710_PXH_HUB_B	0x032a	PCIE-PCIX Bridge Hub B
@@ -1390,6 +1390,12 @@ product INTEL 82801ER_SATA	0x24df	82801ER SATA
 product INTEL 82820_MCH		0x2501	82820 MCH
 product INTEL 82820_AGP		0x250f	82820 AGP
 product INTEL 82850_HB		0x2530	82850 Host
+product INTEL 82860_HB		0x2531	82860 Host
+product INTEL 82850_AGP		0x2532	82850/82860 AGP
+product INTEL 82860_PCI1	0x2533	82860 PCI-PCI
+product INTEL 82860_PCI2	0x2534	82860 PCI-PCI
+product INTEL 82860_PCI3	0x2535	82860 PCI-PCI
+product INTEL 82860_PCI4	0x2536	82860 PCI-PCI
 product INTEL E7500_HB		0x2540	E7500 MCH Host
 product INTEL E7500_DRAM	0x2541	E7500 DRAM
 product INTEL E7500_HI_B1	0x2543	E7500 MCH HI_B vppb 1
@@ -1398,12 +1404,6 @@ product INTEL E7500_HI_C1	0x2545	E7500 MCH HI_C vppb 1
 product INTEL E7500_HI_C2	0x2546	E7500 MCH HI_C vppb 2
 product INTEL E7500_HI_D1	0x2547	E7500 MCH HI_D vppb 1
 product INTEL E7500_HI_D2	0x2548	E7500 MCH HI_D vppb 2
-product INTEL 82860_HB		0x2531	82860 Host
-product INTEL 82850_AGP		0x2532	82850/82860 AGP
-product INTEL 82860_PCI1	0x2533	82860 PCI-PCI
-product INTEL 82860_PCI2	0x2534	82860 PCI-PCI
-product INTEL 82860_PCI3	0x2535	82860 PCI-PCI
-product INTEL 82860_PCI4	0x2536	82860 PCI-PCI
 product INTEL 82845G		0x2560	82845G/GL
 product INTEL 82845G_AGP	0x2561	82845G/GL/GV/GE/PE AGP
 product INTEL 82845G_IGD	0x2562	82845G/GL Video
@@ -1432,22 +1432,19 @@ product INTEL 82801FB_USB_3	0x265a	82801FB USB
 product INTEL 82801FB_USB	0x265c	82801FB USB
 product INTEL 82801FB_PCIE_1	0x2660	82801FB PCIE
 product INTEL 82801FB_PCIE_2	0x2662	82801FB PCIE
+product INTEL RCU32		0x3092	RCU32 I2O RAID
 product INTEL 31244		0x3200	31244 SATA
+product INTEL 82855PE		0x3340	82855PE Hub
+product INTEL 82855PE_AGP	0x3341	82855PE AGP
 product INTEL 82830MP_IO_1	0x3575	82830MP CPU-I/O-1
 product INTEL 82830MP_AGP	0x3576	82830MP CPU-AGP
 product INTEL 82830MP_IV	0x3577	82830MP Integrated Video
 product INTEL 82830MP_IO_2	0x3578	82830MP CPU-I/O-2
 product INTEL 82852GM_HPB	0x3580	82852GM Hub-PCI
+product INTEL 82852_AGP		0x3581	82852/82855 AGP
 product INTEL 82852GM_AGP	0x3582	82852GM AGP
 product INTEL 82852GM_MEM	0x3584	82852GM Memory
 product INTEL 82852GM_CFG	0x3585	82852GM Configuration
-product INTEL 82855PE		0x3340	82855PE Hub
-product INTEL 82855PE_AGP	0x3341	82855PE AGP
-product INTEL RCU32		0x3092	RCU32 I2O RAID
-product INTEL 82852_IO1		0x3580	82852/82855 CPU-I/O-1
-product INTEL 82852_AGP		0x3581	82852/82855 AGP
-product INTEL 82852_IO2		0x3584	82852/82855 CPU-I/O-2
-product INTEL 82852_IO3		0x3585	82852/82855 CPU-I/O-3
 product INTEL E7710_SMCH	0x3590	E7710 SMCH
 product INTEL E7710_MCH_ERR	0x3591	E7710 MCH ERR
 product INTEL E7710_MCH_DMA	0x3594	E7710 MCH DMA
@@ -1496,8 +1493,8 @@ product INTEL PCI450_PB		0x84c4	82450KX/GX
 product INTEL PCI450_MC		0x84c5	82450KX/GX Memory
 product INTEL 82451NX		0x84ca	82451NX Mem & IO
 product INTEL 82454NX		0x84cb	82454NX PXB
-product INTEL 82802AB		0x89ad	82802AB Firmware Hub 4Mbit
 product INTEL 82802AC		0x89ac	82802AC Firmware Hub 8Mbit
+product INTEL 82802AB		0x89ad	82802AB Firmware Hub 4Mbit
 product INTEL I2OPCIB		0x9620	I2O RAID PCI-PCI
 product INTEL RCU21		0x9621	RCU21 I2O RAID
 product INTEL RCUxx		0x9622	RCUxx I2O RAID