From 3c7ead3c64ac79cecd9c64ade2f8f4a272ef103d Mon Sep 17 00:00:00 2001
From: avg <avg@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Fri, 14 Apr 2017 16:40:10 +0000
Subject: [PATCH] fix mismerge in r316846, MFC of r315858

git-svn-id: svn://svn.freebsd.org/base/stable/10@316857 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/dev/aacraid/aacraid_cam.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sys/dev/aacraid/aacraid_cam.c b/sys/dev/aacraid/aacraid_cam.c
index 8608e6d4a..c2b0fd91e 100644
--- a/sys/dev/aacraid/aacraid_cam.c
+++ b/sys/dev/aacraid/aacraid_cam.c
@@ -242,7 +242,6 @@ aac_cam_event(struct aac_softc *sc, struct aac_event *event, void *arg)
 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;
 
-- 
2.45.0