From owner-svn-src-all@FreeBSD.ORG Mon Jul 30 03:00:59 2012 Return-Path: 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 26504106566C; Mon, 30 Jul 2012 03:00:59 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EB3AA8FC17; Mon, 30 Jul 2012 03:00:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6U30wfh039908; Mon, 30 Jul 2012 03:00:58 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6U30w2x039903; Mon, 30 Jul 2012 03:00:58 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201207300300.q6U30w2x039903@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Mon, 30 Jul 2012 03:00:58 +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: r238894 - in head/sys: cam/scsi modules/cam 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jul 2012 03:00:59 -0000 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 #include -#include - 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 #include -#include - /* * 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 #include -#include - /* 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)