diff --git a/qla_isp/LICENSE b/qla_isp/LICENSE
index 029850395..fe47a29ea 100644
--- a/qla_isp/LICENSE
+++ b/qla_isp/LICENSE
@@ -29,9 +29,8 @@ the GNU Public License ("GPL") with platforms where the prevalant license
 is the GNU Public License:
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ it under the terms of The Version 2 GNU General Public License as published
+ by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -51,3 +50,4 @@ USA
 
 gplbsd at feral com
 
+$Id: LICENSE,v 1.9 2007/07/07 23:20:56 mjacob Exp $
diff --git a/qla_isp/linux-2.6/Makefile b/qla_isp/linux-2.6/Makefile
index 4530d2653..84a337c1b 100644
--- a/qla_isp/linux-2.6/Makefile
+++ b/qla_isp/linux-2.6/Makefile
@@ -5,9 +5,8 @@
 # Copyright (c) 2006-2007 by Matthew Jacob
 #
 #  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
+#  it under the terms of The Version 2 GNU General Public License as published
+#  by the Free Software Foundation.
 #
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/qla_isp/linux-2.6/build/Makefile b/qla_isp/linux-2.6/build/Makefile
index de208f8cc..490b0017f 100644
--- a/qla_isp/linux-2.6/build/Makefile
+++ b/qla_isp/linux-2.6/build/Makefile
@@ -3,9 +3,8 @@
 # Copyright (c) 2006-2007 by Matthew Jacob
 #
 #  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
+#  it under the terms of The Version 2 GNU General Public License as published
+#  by the Free Software Foundation.
 #
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/qla_isp/linux/Makefile b/qla_isp/linux/Makefile
deleted file mode 100644
index 3116bae5c..000000000
--- a/qla_isp/linux/Makefile
+++ /dev/null
@@ -1,143 +0,0 @@
-# $Id: Makefile,v 1.27 2006/12/18 18:24:00 mjacob Exp $
-#
-# Qlogic ISP Host Adapter Build File
-#
-#  Copyright (c) 1997-2006 by Matthew Jacob
-#  All rights reserved.
-# 
-#  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,
-#      without modification, immediately at the beginning of the file.
-#   2. 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
-# 
-#  Alternatively, this software may be distributed under the terms of the
-#  the GNU Public License ("GPL") with platforms where the prevalant license
-#  is the GNU Public License:
-# 
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-# 
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#  
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-#  Matthew Jacob
-# 
-#  isplicense at feral com
-#
-#
-LVERS	=	$(shell uname -r)
-LINUX	?=	/lib/modules/${LVERS}/build
-SERNO	=	$(shell hostid)
-_SLIST	=	s/i.86/i386/ -e s/sun4u/sparc64/ -e s/sun4d/sparc/ \
-		-e s/sun4m/sparc/ -e s/sun4c/sparc/ -e s/arm.*/arm/ \
-		-e s/sa110/arm/
-ARCH	:=	$(shell uname -m | sed -e $(_SLIST))
-CC	=	cc
-XFLAGS	=
-MODV	=	-DMODVERSIONS
-MODF	=	-DMODULE ${MODV}
-DEFS	=	-D__KERNEL__ $(TMODE) $(MODF) ${XFLAGS} -DSERNO=\"$(SERNO)\"
-KMOD	=	isp_mod.o
-include	Makefile.${ARCH}
-IFLAGS	=	-I. -I../common -I../firmware -I${LINUX}/drivers/scsi \
-		-I${LINUX}/include
-GKCFLAGS+=	$(DEFS) $(IFLAGS) -Werror -Wall -Wstrict-prototypes ${KCFLAGS}
-COMD	=	../common
-ALLSRC	=	isp_pci.c isp_linux.c isp_cb_ops.c \
-		${COMD}/isp.c ${COMD}/isp_target.c ${COMD}/isp_library.c
-COM_HDRS=	${COMD}/ispmbox.h ${COMD}/ispvar.h ${COMD}/ispreg.h \
-		${COMD}/isp_library.h ${COMD}/isp_target.h \
-		${COMD}/isp_tpublic.h ${COMD}/isp_stds.h
-KOBJ	=	isp_pci.o isp_linux.o isp.o isp_cb_ops.o isp_target.o isp_library.o
-TOOLS	=	isp_clrstats isp_debug isp_getrole isp_getstats isp_rescan \
-		isp_lip isp_setrole isp_getpdb isp_gethba isp_struct
-CFLAGS	=	-O -I. -I../common
-LOC_HDRS=	isp_linux.h
-ALL_HDRS=	${LOC_HDRS} ${COM_HDRS}
-
-VPATH	=	. ../tools
-
-
-all:	$(KMOD)
-
-isp_mod.o: ${KOBJ}
-	$(LD) -r -o $@ ${KOBJ}
-
-isp_pci.o:	./isp_pci.c $(COM_HDRS) $(LOC_HDRS)
-	$(CC) $(GKCFLAGS) -c -o isp_pci.o ./isp_pci.c
-
-isp.o:	${COMD}/isp.c $(COM_HDRS) $(LOC_HDRS)
-	$(CC) $(GKCFLAGS) -c -o $@ ${COMD}/isp.c
-
-isp_target.o:	${COMD}/isp_target.c ${COMD}/isp_target.h $(ALL_HDRS)
-	$(CC) $(GKCFLAGS) -c -o $@ ${COMD}/isp_target.c
-
-isp_library.o:	${COMD}/isp_library.c ${COMD}/isp_library.h $(ALL_HDRS)
-	$(CC) $(GKCFLAGS) -c -o $@ ${COMD}/isp_library.c
-
-
-isp_linux.o:	isp_linux.c $(COM_HDRS) $(LOC_HDRS)
-	$(CC) $(GKCFLAGS) -c -o $@ ./isp_linux.c
-
-isp_cb_ops.o:	isp_cb_ops.c $(COM_HDRS) $(LOC_HDRS)
-	$(CC) $(GKCFLAGS) -c -o $@ ./isp_cb_ops.c
-
-
-scsi_tgt.o: scsi_target.c scsi_target.h ${ALL_HDRS}
-	$(CC) $(GKCFLAGS) -c -o scsi_target.o scsi_target.c
-	$(LD) -r -o $@ scsi_target.o
-
-alltgt:
-	$(MAKE) TMODE='-DISP_TARGET_MODE=1 -DISP_DEFAULT_ROLES=ISP_ROLE_NONE ' all
-
-scsi_target_ctl:	scsi_target_ctl.o scsi_target.h
-	$(CC) -o $@ scsi_target_ctl.c
-
-tgt	:=	KMOD	+=	scsi_tgt.o
-tgt:	scsi_target_ctl scsi_tgt.o alltgt
-
-tools	:=	CFLAGS += -O -I.
-tools:	${TOOLS}
-
-
-tags:	FRC
-	ctags *.[ch] ../common/*.[ch]
-
-etags:	FRC
-	etags --declarations --members *.[ch] ../common/*.[ch]
-
-clean:
-	@touch x.o
-	$(RM) *.o scsi_target_ctl ${TOOLS}
-
-clobber:	clean
-	${RM} tags TAGS
-
-FRC:
-
diff --git a/qla_isp/linux/Makefile.alpha b/qla_isp/linux/Makefile.alpha
deleted file mode 100644
index ef5116810..000000000
--- a/qla_isp/linux/Makefile.alpha
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: Makefile.alpha,v 1.8 2006/02/17 22:53:51 mjacob Exp $
-#
-#  Copyright (c) 1997-2006 by Matthew Jacob
-#  All rights reserved.
-# 
-#  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,
-#      without modification, immediately at the beginning of the file.
-#   2. 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
-# 
-#  Alternatively, this software may be distributed under the terms of the
-#  the GNU Public License ("GPL") with platforms where the prevalant license
-#  is the GNU Public License:
-# 
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-# 
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#  
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-#  Matthew Jacob
-# 
-#  isplicense at feral com
-#
-KCFLAGS	= -fomit-frame-pointer -pipe -mno-fp-regs -ffixed-8 -mcpu=ev5 \
-	-Wa,-mev6 -O2 -include ${LINUX}/include/linux/modversions.h
diff --git a/qla_isp/linux/Makefile.i386 b/qla_isp/linux/Makefile.i386
deleted file mode 100644
index 9775989df..000000000
--- a/qla_isp/linux/Makefile.i386
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: Makefile.i386,v 1.11 2006/11/16 00:19:47 mjacob Exp $
-# 
-#  Copyright (c) 1997-2006 by Matthew Jacob
-#  All rights reserved.
-# 
-#  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,
-#      without modification, immediately at the beginning of the file.
-#   2. 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
-# 
-#  Alternatively, this software may be distributed under the terms of the
-#  the GNU Public License ("GPL") with platforms where the prevalant license
-#  is the GNU Public License:
-# 
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-# 
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#  
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-#  Matthew Jacob
-# 
-#  isplicense feral com
-#
-KCFLAGS = -fno-strict-aliasing -pipe  -march=i686 -g -O2 \
-	-include ${LINUX}/include/linux/modversions.h
diff --git a/qla_isp/linux/Makefile.ppc b/qla_isp/linux/Makefile.ppc
deleted file mode 100644
index fd8ea6a5e..000000000
--- a/qla_isp/linux/Makefile.ppc
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: Makefile.ppc,v 1.8 2006/02/17 22:53:51 mjacob Exp $
-# 
-#  Copyright (c) 1997-2006 by Matthew Jacob
-#  All rights reserved.
-# 
-#  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,
-#      without modification, immediately at the beginning of the file.
-#   2. 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
-# 
-#  Alternatively, this software may be distributed under the terms of the
-#  the GNU Public License ("GPL") with platforms where the prevalant license
-#  is the GNU Public License:
-# 
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-# 
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#  
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-#  Matthew Jacob
-# 
-#  isplicense feral com
-#
-CC=gcc
-KCFLAGS	= -fomit-frame-pointer -fno-strict-aliasing -D__powerpc__ \
-	-fsigned-char -msoft-float -pipe -fno-builtin -ffixed-r2 \
-	-Wno-uninitialized -mmultiple -mstring -O2 \
-	-include ${LINUX}/include/linux/modversions.h
diff --git a/qla_isp/linux/Makefile.sparc b/qla_isp/linux/Makefile.sparc
deleted file mode 100644
index 988c04949..000000000
--- a/qla_isp/linux/Makefile.sparc
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: Makefile.sparc,v 1.8 2006/02/17 22:53:51 mjacob Exp $
-# 
-#  Copyright (c) 1997-2006 by Matthew Jacob
-#  All rights reserved.
-# 
-#  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,
-#      without modification, immediately at the beginning of the file.
-#   2. 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
-# 
-#  Alternatively, this software may be distributed under the terms of the
-#  the GNU Public License ("GPL") with platforms where the prevalant license
-#  is the GNU Public License:
-# 
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-# 
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#  
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-#  Matthew Jacob
-# 
-#  isplicense at feral com
-#
-CC=gcc
-KCFLAGS= -fomit-frame-pointer -fno-strict-aliasing -m32 -pipe -mno-fpu \
-	-fcall-used-g5 -fcall-used-g7 -O2 \
-	-include ${LINUX}/include/linux/modversions.h
-KMOD	=	isp_sbus.o
diff --git a/qla_isp/linux/Makefile.sparc64 b/qla_isp/linux/Makefile.sparc64
deleted file mode 100644
index 757dac315..000000000
--- a/qla_isp/linux/Makefile.sparc64
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: Makefile.sparc64,v 1.8 2006/02/17 22:53:51 mjacob Exp $
-# 
-#  Copyright (c) 1997-2006 by Matthew Jacob
-#  All rights reserved.
-# 
-#  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,
-#      without modification, immediately at the beginning of the file.
-#   2. 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
-# 
-#  Alternatively, this software may be distributed under the terms of the
-#  the GNU Public License ("GPL") with platforms where the prevalant license
-#  is the GNU Public License:
-# 
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-# 
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#  
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-#  Matthew Jacob
-# 
-#  isplicense at feral com
-#
-CC=sparc64-linux-gcc
-KCFLAGS	= -fomit-frame-pointer -fno-strict-aliasing -m64 -pipe -mno-fpu \
-	-mcpu=ultrasparc -mcmodel=medlow -ffixed-g4 -fcall-used-g5 \
-	-fcall-used-g7 -Wno-sign-compare -O2 \
-	-include ${LINUX}/include/linux/modversions.h
-LDFLAGS=-m elf64_sparc -r
diff --git a/qla_isp/linux/Makefile.x86_64 b/qla_isp/linux/Makefile.x86_64
deleted file mode 100644
index 0ba1ce0fb..000000000
--- a/qla_isp/linux/Makefile.x86_64
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: Makefile.x86_64,v 1.5 2006/02/17 22:53:52 mjacob Exp $
-# 
-#  Copyright (c) 2006 by Matthew Jacob
-#  All rights reserved.
-# 
-#  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,
-#      without modification, immediately at the beginning of the file.
-#   2. 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
-# 
-#  Alternatively, this software may be distributed under the terms of the
-#  the GNU Public License ("GPL") with platforms where the prevalant license
-#  is the GNU Public License:
-# 
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-# 
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#  
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-#  Matthew Jacob
-# 
-#  isplicense at feral com
-#
-KCFLAGS = -fno-strict-aliasing -fno-common -fomit-frame-pointer -mno-red-zone -mcmodel=kernel -pipe -fno-reorder-blocks -finline-limit=2000 -fno-strength-reduce -Wno-sign-compare -fno-asynchronous-unwind-tables -fno-unit-at-a-time -march=nocona 
-
diff --git a/qla_isp/linux/isp_scst.c b/qla_isp/linux/isp_scst.c
index 065200d41..ea6ffd4dc 100644
--- a/qla_isp/linux/isp_scst.c
+++ b/qla_isp/linux/isp_scst.c
@@ -30,9 +30,8 @@
  *  is the GNU Public License:
  * 
  *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
+ *   it under the terms of The Version 2 GNU General Public License as published
+ *    by the Free Software Foundation.
  * 
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of