svn commit: r316857 - stable/10/sys/dev/aacraid

Andriy Gapon avg at FreeBSD.org
Fri Apr 14 16:40:11 UTC 2017


Author: avg
Date: Fri Apr 14 16:40:10 2017
New Revision: 316857
URL: https://svnweb.freebsd.org/changeset/base/316857

Log:
  fix mismerge in r316846, MFC of r315858

Modified:
  stable/10/sys/dev/aacraid/aacraid_cam.c

Modified: stable/10/sys/dev/aacraid/aacraid_cam.c
==============================================================================
--- stable/10/sys/dev/aacraid/aacraid_cam.c	Fri Apr 14 16:30:37 2017	(r316856)
+++ stable/10/sys/dev/aacraid/aacraid_cam.c	Fri Apr 14 16:40:10 2017	(r316857)
@@ -242,7 +242,6 @@ aac_cam_event(struct aac_softc *sc, stru
 static int
 aac_cam_probe(device_t dev)
 {
-	struct aac_softc *sc;
 	struct aac_cam *camsc;
 
 	camsc = (struct aac_cam *)device_get_softc(dev);
@@ -1134,7 +1133,6 @@ aac_cam_poll(struct cam_sim *sim)
 static void
 aac_container_complete(struct aac_command *cm)
 {
-	struct	aac_softc *sc;
 	union	ccb *ccb;
 	u_int32_t status;
 


More information about the svn-src-all mailing list