From owner-svn-src-head@FreeBSD.ORG  Mon Oct 13 12:28:33 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D2E4B1065693;
	Mon, 13 Oct 2008 12:28:33 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C0C108FC0A;
	Mon, 13 Oct 2008 12:28:33 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9DCSXbR076151;
	Mon, 13 Oct 2008 12:28:33 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9DCSXql076150;
	Mon, 13 Oct 2008 12:28:33 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200810131228.m9DCSXql076150@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Mon, 13 Oct 2008 12:28:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r183817 - head/sys/dev/puc
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Oct 2008 12:28:33 -0000

Author: des
Date: Mon Oct 13 12:28:33 2008
New Revision: 183817
URL: http://svn.freebsd.org/changeset/base/183817

Log:
  Revert r179409; it breaks all OX16PCI954-based cards except the SIIG 4.
  
  MFC after:	3 days

Modified:
  head/sys/dev/puc/pucdata.c

Modified: head/sys/dev/puc/pucdata.c
==============================================================================
--- head/sys/dev/puc/pucdata.c	Mon Oct 13 06:25:28 2008	(r183816)
+++ head/sys/dev/puc/pucdata.c	Mon Oct 13 12:28:33 2008	(r183817)
@@ -603,14 +603,14 @@ const struct puc_cfg puc_pci_devices[] =
 	},
 
 	{   0x1415, 0x9501, 0xffff, 0,
-	    "Oxford Semiconductor OX16PCI954 UARTs 4-port type 1",
-	    DEFAULT_RCLK * 10,
+	    "Oxford Semiconductor OX16PCI954 UARTs",
+	    DEFAULT_RCLK,
 	    PUC_PORT_4S, 0x10, 0, 8,
 	},
 
 	{   0x1415, 0x950a, 0xffff, 0,
-	    "Oxford Semiconductor OX16PCI954 UARTs 4-port type 2",
-	    DEFAULT_RCLK * 10,
+	    "Oxford Semiconductor OX16PCI954 UARTs",
+	    DEFAULT_RCLK,
 	    PUC_PORT_4S, 0x10, 0, 8,
 	},