missed a merge conflict

[debian/mtx] / scsi_linux.c

diff --git a/scsi_linux.c b/scsi_linux.c
index 06cdd7e31bf31599cddad1872d940502e981fa1e..cc14ebf67188a6d939e793654a95129847f23b9a 100644 (file)
--- a/scsi_linux.c
+++ b/scsi_linux.c
@@ -1,8 +1,9 @@
 /* Copyright 1997, 1998 Leonard Zubkoff <lnz@dandelion.com>
    Changes in Feb 2000 Eric Green <eric@badtux.org>
+   Copyright 2007-2008 by Robert Nelson <robertn@the-nelsons.org>
 
-$Date: 2007-03-24 21:17:10 -0700 (Sat, 24 Mar 2007) $
-$Revision: 171 $
+$Date: 2008-08-19 03:03:38 -0700 (Tue, 19 Aug 2008) $
+$Revision: 193 $
 
   This program is free software; you may redistribute and/or modify it under
   the terms of the GNU General Public License Version 2 as published by the
@@ -15,10 +16,7 @@ $Revision: 171 $
 
 */
 
-#include <linux/param.h>
-#include <scsi/sg.h>
-
-/* this is the SCSI commands for Linux. Note that <eric@estinc.com> changed 
+/* this is the SCSI commands for Linux. Note that <eric@badtux.org> changed 
  * it from using SCSI_IOCTL_SEND_COMMAND to using the SCSI generic interface.
  */