[src/trunk]: src/sys/dev/pci Remove extraneous //// markers of potential conf...

[jonathan <jonathan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/33cfb95bb65e
branches:  trunk
changeset: 586255:33cfb95bb65e
user:      jonathan <jonathan%NetBSD.org@localhost>
date:      Sun Dec 11 19:59:06 2005 +0000

description:
Remove extraneous //// markers of potential conflict in last commit.

diffstat:

 sys/dev/pci/pcidevs |  4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r 75a38e0951b2 -r 33cfb95bb65e sys/dev/pci/pcidevs
--- a/sys/dev/pci/pcidevs       Sun Dec 11 19:34:47 2005 +0000
+++ b/sys/dev/pci/pcidevs       Sun Dec 11 19:59:06 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.746 2005/12/11 19:34:47 jonathan Exp $
+$NetBSD: pcidevs,v 1.747 2005/12/11 19:59:06 jonathan Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -1669,11 +1669,9 @@
 product INTEL 80321            0x0319  80321 I/O Processor
 product INTEL 6700PXH_PCIE0    0x0329  6700PXH PCI Express-to-PCI Bridge #0
 product INTEL 6700PXH_PCIE1    0x032a  6700PXH PCI Express-to-PCI Bridge #1
-///
 product INTEL SRCZCRX          0x0407  RAID controller
 product INTEL SRCU42E          0x0408  SCSI RAID controller
 product INTEL SRCS28X          0x0409  SATA RAID controller
-///
 product INTEL PCEB             0x0482  82375EB/SB PCI-EISA Bridge
 product INTEL CDC              0x0483  82424ZX Cache and DRAM controller
 product INTEL SIO              0x0484  82378ZB System I/O