Remove erroneously doubled text (patch can do that when a new file

comes into existence simultaneously from two directions).

1 files changed, 1 insertions, 80 deletions

diff --git a/sys/scsi/ssvar.h b/sys/scsi/ssvar.h
index 166c9d3770f..55ea6b42f77 100644
--- a/sys/scsi/ssvar.h
+++ b/sys/scsi/ssvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ssvar.h,v 1.3 1996/04/21 22:31:18 deraadt Exp $	*/
+/*	$OpenBSD: ssvar.h,v 1.4 1996/05/07 09:34:35 niklas Exp $	*/
 /*	$NetBSD: ssvar.h,v 1.2 1996/03/30 21:47:11 christos Exp $	*/
 
 /*
@@ -82,82 +82,3 @@ struct ss_softc {
  */
 void mustek_attach __P((struct ss_softc *, struct scsibus_attach_args *));
 void scanjet_attach __P((struct ss_softc *, struct scsibus_attach_args *));
-/*	$NetBSD: ssvar.h,v 1.1 1996/02/18 20:32:50 mycroft Exp $	*/
-
-/*
- * Copyright (c) 1995 Kenneth Stailey.  All rights reserved.
- *   modified for configurable scanner support by Joachim Koenig
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Kenneth Stailey.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * SCSI scanner interface description
- */
-
-/*
- * Special handlers for impractically different scanner types.
- * Register NULL for a function if you want to try the real SCSI code
- * (with quirks table)
- */
-struct ss_special {
-	int	(*set_params)();
-	int	(*trigger_scanner)();
-	int	(*get_params)();
-	void	(*minphys)(); /* some scanners only send line-multiples */
-	int	(*read)();
-	int	(*rewind_scanner)();
-	int	(*load_adf)();
-	int	(*unload_adf)();
-};
-
-/*
- * ss_softc has to be declared here, because the device dependant
- * modules include it
- */
-struct ss_softc {
-	struct device sc_dev;
-
-	int flags;
-#define SSF_TRIGGERED	0x01	/* read operation has been primed */
-#define	SSF_LOADED	0x02	/* parameters loaded */
-	struct scsi_link *sc_link;	/* contains our targ, lun, etc. */
-	struct scan_io sio;
-	struct buf buf_queue;		/* the queue of pending IO operations */
-	u_int quirks;			/* scanner is only mildly twisted */
-#define SS_Q_GET_BUFFER_SIZE	0x0001	/* poll for available data in ssread() */
-/* truncate to byte boundry is assumed by default unless one of these is set */
-#define SS_Q_PAD_TO_BYTE	0x0002	/* pad monochrome data to byte boundary */
-#define SS_Q_PAD_TO_WORD	0x0004	/* pad monochrome data to word boundary */
-#define SS_Q_THRESHOLD_FOLLOWS_BRIGHTNESS 0x0008
-	struct ss_special *special;	/* special handlers for spec. devices */
-};
-
-/*
- * define the special attach routines if configured
- */
-void mustek_attach __P((struct ss_softc *, struct scsibus_attach_args *));
-void scanjet_attach __P((struct ss_softc *, struct scsibus_attach_args *));