Index: sys/cam/cam_ccb.h
===================================================================
--- sys/cam/cam_ccb.h
+++ sys/cam/cam_ccb.h
@@ -913,11 +913,6 @@
 	union	ccb *abort_ccb;	/* Pointer to CCB to abort */
 };
 
-/* Reset SCSI Bus CCB */
-struct ccb_resetbus {
-	struct	ccb_hdr ccb_h;
-};
-
 /* Reset SCSI Device CCB */
 struct ccb_resetdev {
 	struct	ccb_hdr ccb_h;
@@ -1205,12 +1200,6 @@
 	u_int8_t  message_args[7];	/* Message Arguments */
 };
 
-struct ccb_notify_ack {
-	struct	  ccb_hdr ccb_h;
-	u_int16_t seq_id;		/* Sequence identifier */
-	u_int8_t  event;		/* Event flags */
-};
-
 struct ccb_immediate_notify {
 	struct    ccb_hdr ccb_h;
 	u_int     tag_id;		/* Tag for immediate notify */
@@ -1253,30 +1242,6 @@
 	EAD_LZ2V2	/* Engine algorithm ID: LZ2 var.2 */
 } ei_algo;
 
-struct ccb_eng_inq {
-	struct	  ccb_hdr ccb_h;
-	u_int16_t eng_num;	/* The engine number for this inquiry */
-	ei_type   eng_type;	/* Returned engine type */
-	ei_algo   eng_algo;	/* Returned engine algorithm type */
-	u_int32_t eng_memeory;	/* Returned engine memory size */
-};
-
-struct ccb_eng_exec {	/* This structure must match SCSIIO size */
-	struct	  ccb_hdr ccb_h;
-	u_int8_t  *pdrv_ptr;	/* Ptr used by the peripheral driver */
-	u_int8_t  *req_map;	/* Ptr for mapping info on the req. */
-	u_int8_t  *data_ptr;	/* Pointer to the data buf/SG list */
-	u_int32_t dxfer_len;	/* Data transfer length */
-	u_int8_t  *engdata_ptr;	/* Pointer to the engine buffer data */
-	u_int16_t sglist_cnt;	/* Num of scatter gather list entries */
-	u_int32_t dmax_len;	/* Destination data maximum length */
-	u_int32_t dest_len;	/* Destination data length */
-	int32_t	  src_resid;	/* Source residual length: 2's comp */
-	u_int32_t timeout;	/* Timeout value */
-	u_int16_t eng_num;	/* Engine number for this request */
-	u_int16_t vu_flags;	/* Vendor Unique flags */
-};
-
 /*
  * Definitions for the timeout field in the SCSI I/O CCB.
  */
@@ -1350,18 +1315,14 @@
 	struct	ccb_calc_geometry	ccg;
 	struct	ccb_sim_knob		knob;
 	struct	ccb_abort		cab;
-	struct	ccb_resetbus		crb;
 	struct	ccb_resetdev		crd;
 	struct	ccb_termio		tio;
 	struct	ccb_accept_tio		atio;
 	struct	ccb_scsiio		ctio;
 	struct	ccb_en_lun		cel;
 	struct	ccb_immed_notify	cin;
-	struct	ccb_notify_ack		cna;
 	struct	ccb_immediate_notify	cin1;
 	struct	ccb_notify_acknowledge	cna2;
-	struct	ccb_eng_inq		cei;
-	struct	ccb_eng_exec		cee;
 	struct	ccb_smpio		smpio;
 	struct 	ccb_rescan		crcn;
 	struct  ccb_debug		cdbg;