From owner-svn-src-all@FreeBSD.ORG  Mon Jul 13 06:12:21 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CE4AB1065670;
	Mon, 13 Jul 2009 06:12:21 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BC5FB8FC12;
	Mon, 13 Jul 2009 06:12:21 +0000 (UTC) (envelope-from mav@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 n6D6CLND014562;
	Mon, 13 Jul 2009 06:12:21 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6D6CLMP014560;
	Mon, 13 Jul 2009 06:12:21 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200907130612.n6D6CLMP014560@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 13 Jul 2009 06:12:21 +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: r195653 - head/sys/cam/ata
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jul 2009 06:12:22 -0000

Author: mav
Date: Mon Jul 13 06:12:21 2009
New Revision: 195653
URL: http://svn.freebsd.org/changeset/base/195653

Log:
  Rename ATA probe driver to "aprobe" to resolve name conflict with SCSI
  and fix loading cam as module.
  
  Approved by:	re (implicitly)

Modified:
  head/sys/cam/ata/ata_xpt.c

Modified: head/sys/cam/ata/ata_xpt.c
==============================================================================
--- head/sys/cam/ata/ata_xpt.c	Mon Jul 13 05:51:33 2009	(r195652)
+++ head/sys/cam/ata/ata_xpt.c	Mon Jul 13 06:12:21 2009	(r195653)
@@ -83,11 +83,11 @@ static periph_init_t probe_periph_init;
 
 static struct periph_driver probe_driver =
 {
-	probe_periph_init, "probe",
+	probe_periph_init, "aprobe",
 	TAILQ_HEAD_INITIALIZER(probe_driver.units)
 };
 
-PERIPHDRIVER_DECLARE(probe, probe_driver);
+PERIPHDRIVER_DECLARE(aprobe, probe_driver);
 
 typedef enum {
 	PROBE_RESET,
@@ -1311,7 +1311,7 @@ ata_scan_lun(struct cam_periph *periph, 
 		request_ccb->crcn.flags = flags;
 	}
 
-	if ((old_periph = cam_periph_find(path, "probe")) != NULL) {
+	if ((old_periph = cam_periph_find(path, "aprobe")) != NULL) {
 		probe_softc *softc;
 
 		softc = (probe_softc *)old_periph->softc;
@@ -1319,7 +1319,7 @@ ata_scan_lun(struct cam_periph *periph, 
 				  periph_links.tqe);
 	} else {
 		status = cam_periph_alloc(proberegister, NULL, probecleanup,
-					  probestart, "probe",
+					  probestart, "aprobe",
 					  CAM_PERIPH_BIO,
 					  request_ccb->ccb_h.path, NULL, 0,
 					  request_ccb);