svn commit: r238894 - in head/sys: cam/scsi modules/cam

[Bjoern A. Zeeb]

Author: bz
Date: Mon Jul 30 03:00:58 2012
New Revision: 238894
URL: http://svn.freebsd.org/changeset/base/238894

Log:
  Remove opt_enc.h from files committed with r235911.  enc(4) is the
  'encapsulating interface' used with IPsec and has nothing to do with
  storage 'enclosure' services.
  
  MFC after:	3 days
  Noticed while:	debugging why enc(4) is no longer automatically created

Modified:
  head/sys/cam/scsi/scsi_enc.c
  head/sys/cam/scsi/scsi_enc_safte.c
  head/sys/cam/scsi/scsi_enc_ses.c
  head/sys/modules/cam/Makefile

Modified: head/sys/cam/scsi/scsi_enc.c
==============================================================================
--- head/sys/cam/scsi/scsi_enc.c	Mon Jul 30 01:42:22 2012	(r238893)
+++ head/sys/cam/scsi/scsi_enc.c	Mon Jul 30 03:00:58 2012	(r238894)
@@ -56,8 +56,6 @@ __FBSDID("$FreeBSD$");
 #include <cam/scsi/scsi_enc.h>
 #include <cam/scsi/scsi_enc_internal.h>
 
-#include <opt_enc.h>
-
 MALLOC_DEFINE(M_SCSIENC, "SCSI ENC", "SCSI ENC buffers");
 
 /* Enclosure type independent driver */

Modified: head/sys/cam/scsi/scsi_enc_safte.c
==============================================================================
--- head/sys/cam/scsi/scsi_enc_safte.c	Mon Jul 30 01:42:22 2012	(r238893)
+++ head/sys/cam/scsi/scsi_enc_safte.c	Mon Jul 30 03:00:58 2012	(r238894)
@@ -48,8 +48,6 @@ __FBSDID("$FreeBSD$");
 #include <cam/scsi/scsi_enc_internal.h>
 #include <cam/scsi/scsi_message.h>
 
-#include <opt_enc.h>
-
 /*
  * SAF-TE Type Device Emulation
  */

Modified: head/sys/cam/scsi/scsi_enc_ses.c
==============================================================================
--- head/sys/cam/scsi/scsi_enc_ses.c	Mon Jul 30 01:42:22 2012	(r238893)
+++ head/sys/cam/scsi/scsi_enc_ses.c	Mon Jul 30 03:00:58 2012	(r238894)
@@ -56,8 +56,6 @@ __FBSDID("$FreeBSD$");
 #include <cam/scsi/scsi_enc.h>
 #include <cam/scsi/scsi_enc_internal.h>
 
-#include <opt_enc.h>
-
 /* SES Native Type Device Support */
 
 /* SES Diagnostic Page Codes */

Modified: head/sys/modules/cam/Makefile
==============================================================================
--- head/sys/modules/cam/Makefile	Mon Jul 30 01:42:22 2012	(r238893)
+++ head/sys/modules/cam/Makefile	Mon Jul 30 03:00:58 2012	(r238894)
@@ -14,7 +14,6 @@ SRCS+=	opt_scsi.h
 SRCS+=	opt_cd.h
 SRCS+=	opt_pt.h
 SRCS+=	opt_sa.h
-SRCS+=	opt_enc.h
 SRCS+=	device_if.h bus_if.h vnode_if.h
 SRCS+=	cam.c
 .if exists($S/${MACHINE}/${MACHINE}/cam_machdep.c)