From c2d375cdcb04122f97908079581dda41a08c0d07 Mon Sep 17 00:00:00 2001
From: Jerry Jelinek <jerry.jelinek@joyent.com>
Date: Thu, 14 Jun 2018 13:51:25 +0000
Subject: 9506 Want support for QLogic QL41000/45000 series devices [fix
 incomplete merge]

---
 usr/src/uts/intel/qede/Makefile | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/usr/src/uts/intel/qede/Makefile b/usr/src/uts/intel/qede/Makefile
index 088ac3b41d..3976cef74b 100644
--- a/usr/src/uts/intel/qede/Makefile
+++ b/usr/src/uts/intel/qede/Makefile
@@ -49,23 +49,10 @@ CERRWARN	+= -_gcc=-Wno-unused-variable
 CERRWARN	+= -_gcc=-Wno-unused-function
 
 ALL_TARGET	= $(BINARY) $(CONFMOD)
-<<<<<<< HEAD
-LINT_TARGET	= $(MODULE).lint
-=======
->>>>>>> FETCH_HEAD
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 LDFLAGS		+= -dy -N misc/mac
 
-<<<<<<< HEAD
-#
-# We only support the 64-bit version of this driver.
-#
-DEF_BUILDS	= $(DEF_BUILDSONLY64)
-ALL_BUILDS	= $(ALL_BUILDSONLY64)
-
-=======
->>>>>>> FETCH_HEAD
 .KEEP_STATE:
 
 def:		$(DEF_DEPS)
@@ -76,17 +63,9 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-<<<<<<< HEAD
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-=======
 lint:
 modlintlib:
 clean.lint:
->>>>>>> FETCH_HEAD
 
 install:	$(INSTALL_DEPS)
 
-- 
cgit v1.2.3