From owner-svn-src-stable-8@FreeBSD.ORG  Sat Dec 19 11:05:42 2009
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A572C106566B;
	Sat, 19 Dec 2009 11:05:42 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9428B8FC14;
	Sat, 19 Dec 2009 11:05:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBJB5g3n031046;
	Sat, 19 Dec 2009 11:05:42 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBJB5gtt031044;
	Sat, 19 Dec 2009 11:05:42 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <200912191105.nBJB5gtt031044@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 19 Dec 2009 11:05:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200718 - stable/8/sys/dev/ichsmb
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Dec 2009 11:05:42 -0000

Author: avg
Date: Sat Dec 19 11:05:42 2009
New Revision: 200718
URL: http://svn.freebsd.org/changeset/base/200718

Log:
  MFC r200053,200091: ichsmb: drop default attachment to generic smbus hw
  
  Note that r200091 completely overrides r200053 and the merge of the
  former is recorded for bookkeeping only.
  r200091 won't be merged to 'more stable' branche(s) because of the POLA.

Modified:
  stable/8/sys/dev/ichsmb/ichsmb_pci.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/ichsmb/ichsmb_pci.c
==============================================================================
--- stable/8/sys/dev/ichsmb/ichsmb_pci.c	Sat Dec 19 10:55:41 2009	(r200717)
+++ stable/8/sys/dev/ichsmb/ichsmb_pci.c	Sat Dec 19 11:05:42 2009	(r200718)
@@ -175,12 +175,6 @@ ichsmb_pci_probe(device_t dev)
 		device_set_desc(dev, "Intel 631xESB/6321ESB (ESB2) SMBus controller");
 		break;
 	default:
-		if (pci_get_class(dev) == PCIC_SERIALBUS
-		    && pci_get_subclass(dev) == PCIS_SERIALBUS_SMBUS
-		    && pci_get_progif(dev) == PCIS_SERIALBUS_SMBUS_PROGIF) {
-			device_set_desc(dev, "SMBus controller");
-			return (BUS_PROBE_DEFAULT); /* XXX */
-		}
 		return (ENXIO);
 	}