mergegcc9

29 files changed, 31 insertions, 75 deletions

diff --git a/usr/src/lib/cfgadm_plugins/Makefile b/usr/src/lib/cfgadm_plugins/Makefile
index 8fa7f73df7..f83f15fe71 100644
--- a/usr/src/lib/cfgadm_plugins/Makefile
+++ b/usr/src/lib/cfgadm_plugins/Makefile
@@ -42,12 +42,12 @@ all:=		TARGET= all
 install:=	TARGET= install
 clean:=		TARGET= clean
 clobber:=	TARGET= clobber
-lint:=		TARGET= lint
 _msg:=		TARGET= _msg
 
 .KEEP_STATE:
 
-all clean lint: $(SUBDIRS)
+all clean: $(SUBDIRS)
+
 
 install: all $(SUBDIRS)
 
diff --git a/usr/src/lib/cfgadm_plugins/ac/Makefile b/usr/src/lib/cfgadm_plugins/ac/Makefile
index a12d1f6b36..374acb5243 100644
--- a/usr/src/lib/cfgadm_plugins/ac/Makefile
+++ b/usr/src/lib/cfgadm_plugins/ac/Makefile
@@ -35,7 +35,6 @@ clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 delete :=	TARGET= delete
 install :=	TARGET= install
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 catalog :=	TARGET= catalog
 package :=	TARGET= package
@@ -50,10 +49,11 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean delete install lint catalog package: $(SUBDIRS)
+all clean delete install catalog package: $(SUBDIRS)
 clobber: $(SUBDIRS)
 	$(RM) $(POFILE) $(POFILES)
 
+
 $(MACH) $(MACH64):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/cfgadm_plugins/ac/Makefile.com b/usr/src/lib/cfgadm_plugins/ac/Makefile.com
index 68af7f6ad0..bbb9c3ce64 100644
--- a/usr/src/lib/cfgadm_plugins/ac/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/ac/Makefile.com
@@ -57,7 +57,6 @@ CPPFLAGS +=	-I$(ROOT)/usr/platform/$(PLATFORM)/include
 
 all: $(LIBS)
 
-lint:   lintcheck
 
 # Create target directories
 $(USR_PSM_DIR):		$(LINKED_DIRS)
diff --git a/usr/src/lib/cfgadm_plugins/fp/Makefile b/usr/src/lib/cfgadm_plugins/fp/Makefile
index ad6dff9a56..396fd0a6b5 100644
--- a/usr/src/lib/cfgadm_plugins/fp/Makefile
+++ b/usr/src/lib/cfgadm_plugins/fp/Makefile
@@ -18,13 +18,12 @@
 #
 # CDDL HEADER END
 #
-# lib/cfgadm_plugins/fp/Makefile
-# 
+
 #
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+
 
 include		../../Makefile.lib
 
@@ -35,10 +34,9 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint := 	TARGET= lint
 _msg :=		TARGET= _msg
 
-TEXT_DOMAIN= 	SUNW_OST_OSLIB
+TEXT_DOMAIN=	SUNW_OST_OSLIB
 XGETFLAGS=	-a -x fp.xcl
 POFILE=		fp.po
 POFILES=	generic.po
@@ -49,10 +47,11 @@ CP=	cp
 
 .KEEP_STATE:
 
-all lint clean delete install package: $(SUBDIRS)
+all clean delete install package: $(SUBDIRS)
 clobber: $(SUBDIRS)
 	$(RM) $(POFILE) $(POFILES)
 
+
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/cfgadm_plugins/fp/Makefile.com b/usr/src/lib/cfgadm_plugins/fp/Makefile.com
index f2cc0b2c64..fc6fa9ba91 100644
--- a/usr/src/lib/cfgadm_plugins/fp/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/fp/Makefile.com
@@ -39,8 +39,6 @@ ROOTLIBDIR64=	$(ROOTLIBDIR)/$(MACH64)
 
 LIBS=	$(DYNLIB)
 
-LINTFLAGS +=	-DDEBUG
-LINTFLAGS64 +=	-DDEBUG
 
 CFLAGS +=	$(CCVERBOSE)
 CFLAGS64 +=	$(CCVERBOSE)
@@ -56,12 +54,6 @@ SMATCH=off
 
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 
-LINTFLAGS += -erroff=E_SEC_SPRINTF_UNBOUNDED_COPY
-LINTFLAGS += -erroff=E_FUNC_RET_MAYBE_IGNORED2
-LINTFLAGS += -erroff=E_FUNC_RET_ALWAYS_IGNOR2
-LINTFLAGS += -erroff=E_BAD_FORMAT_ARG_TYPE2
-LINTFLAGS += -erroff=E_SEC_CREAT_WITHOUT_MODE
-LINTFLAGS64 += $(LINTFLAGS)
 
 LDLIBS +=	-lc -ldevice -ldevinfo -lrcm
 LDLIBS +=	-lHBAAPI -lgen
@@ -80,7 +72,6 @@ $(ROOTSVCMETHOD):= FILEMODE= 555
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 # Install rules
 
diff --git a/usr/src/lib/cfgadm_plugins/ib/Makefile b/usr/src/lib/cfgadm_plugins/ib/Makefile
index b73c5c7610..b017c4a8ca 100644
--- a/usr/src/lib/cfgadm_plugins/ib/Makefile
+++ b/usr/src/lib/cfgadm_plugins/ib/Makefile
@@ -34,7 +34,6 @@ clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 delete :=	TARGET= delete
 install :=	TARGET= install
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 package :=	TARGET= package
 
@@ -48,10 +47,11 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean delete install lint package: $(SUBDIRS)
+all clean delete install package: $(SUBDIRS)
 clobber: $(SUBDIRS)
 	$(RM) $(POFILE) $(POFILES)
 
+
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/cfgadm_plugins/ib/Makefile.com b/usr/src/lib/cfgadm_plugins/ib/Makefile.com
index d027235875..771e0deacc 100644
--- a/usr/src/lib/cfgadm_plugins/ib/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/ib/Makefile.com
@@ -38,8 +38,6 @@ ROOTLIBDIR64=	$(ROOTLIBDIR)/$(MACH64)
 
 LIBS=	$(DYNLIB)
 
-LINTFLAGS +=	-DDEBUG
-LINTFLAGS64 +=	-DDEBUG
 
 CFLAGS +=	$(CCVERBOSE)
 CFLAGS64 +=	$(CCVERBOSE)
@@ -58,7 +56,6 @@ LDLIBS +=	-lc -ldevice -ldevinfo -lrcm -lnvpair
 
 all:	$(LIBS)
 
-lint:   lintcheck
 
 # Install rules
 
diff --git a/usr/src/lib/cfgadm_plugins/pci/Makefile b/usr/src/lib/cfgadm_plugins/pci/Makefile
index fee3e0b482..9f378bd5c1 100644
--- a/usr/src/lib/cfgadm_plugins/pci/Makefile
+++ b/usr/src/lib/cfgadm_plugins/pci/Makefile
@@ -34,7 +34,6 @@ clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 delete :=	TARGET= delete
 install :=	TARGET= install
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 package :=	TARGET= package
 
@@ -48,10 +47,11 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean delete install lint package: $(SUBDIRS)
+all clean delete install package: $(SUBDIRS)
 clobber: $(SUBDIRS)
 	$(RM) $(POFILE) $(POFILES)
 
+
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/cfgadm_plugins/pci/Makefile.com b/usr/src/lib/cfgadm_plugins/pci/Makefile.com
index 33324f565b..b1e5199514 100644
--- a/usr/src/lib/cfgadm_plugins/pci/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/pci/Makefile.com
@@ -59,7 +59,6 @@ SMATCH=off
 
 all: $(LIBS)
 
-lint:   lintcheck
 
 # Create target directories
 $(USR_LIB_DIR):
diff --git a/usr/src/lib/cfgadm_plugins/sata/Makefile b/usr/src/lib/cfgadm_plugins/sata/Makefile
index 8af0d35460..92211f3266 100644
--- a/usr/src/lib/cfgadm_plugins/sata/Makefile
+++ b/usr/src/lib/cfgadm_plugins/sata/Makefile
@@ -33,11 +33,10 @@ clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 delete :=	TARGET= delete
 install :=	TARGET= install
-lint := 	TARGET= lint
 _msg :=		TARGET= _msg
-package := 	TARGET= package
+package :=	TARGET= package
 
-TEXT_DOMAIN= 	SUNW_OST_OSLIB
+TEXT_DOMAIN=	SUNW_OST_OSLIB
 XGETFLAGS=	-a -x sata.xcl
 POFILE=		sata.po
 POFILES=	generic.po
@@ -47,10 +46,11 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean delete install lint package: $(SUBDIRS)
+all clean delete install package: $(SUBDIRS)
 clobber: $(SUBDIRS)
 	$(RM) $(POFILE) $(POFILES)
 
+
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/cfgadm_plugins/sata/Makefile.com b/usr/src/lib/cfgadm_plugins/sata/Makefile.com
index 6859fdde2a..ed93f17724 100644
--- a/usr/src/lib/cfgadm_plugins/sata/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/sata/Makefile.com
@@ -37,8 +37,6 @@ ROOTLIBDIR64=	$(ROOTLIBDIR)/$(MACH64)
 
 LIBS=	$(DYNLIB)
 
-LINTFLAGS +=	-DDEBUG
-LINTFLAGS64 +=	-DDEBUG
 
 CFLAGS +=	$(CCVERBOSE)
 CFLAGS64 +=	$(CCVERBOSE)
@@ -53,7 +51,6 @@ LDLIBS +=	-lc -ldevice -ldevinfo -lrcm -lnvpair
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 # Install rules
 
diff --git a/usr/src/lib/cfgadm_plugins/sata/amd64/Makefile b/usr/src/lib/cfgadm_plugins/sata/amd64/Makefile
index 12fe21de7f..e93b210efa 100644
--- a/usr/src/lib/cfgadm_plugins/sata/amd64/Makefile
+++ b/usr/src/lib/cfgadm_plugins/sata/amd64/Makefile
@@ -22,13 +22,10 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 include ../../../Makefile.lib.64
 CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
-LINTFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/cfgadm_plugins/sata/i386/Makefile b/usr/src/lib/cfgadm_plugins/sata/i386/Makefile
index 9c9593ade6..bb93bd98cd 100644
--- a/usr/src/lib/cfgadm_plugins/sata/i386/Makefile
+++ b/usr/src/lib/cfgadm_plugins/sata/i386/Makefile
@@ -22,12 +22,9 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
-LINTFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/cfgadm_plugins/sbd/Makefile b/usr/src/lib/cfgadm_plugins/sbd/Makefile
index bd7c451e96..62aff4925b 100644
--- a/usr/src/lib/cfgadm_plugins/sbd/Makefile
+++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile
@@ -34,7 +34,6 @@ clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 delete :=	TARGET= delete
 install :=	TARGET= install
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 package :=	TARGET= package
 
@@ -49,10 +48,11 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean delete install lint package: $(SUBDIRS)
+all clean delete install package: $(SUBDIRS)
 clobber: $(SUBDIRS)
 	$(RM) $(POFILE) $(POFILES)
 
+
 $(MACH) $(MACH64):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
index 2b8f7f5272..1bd1db9b84 100644
--- a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
@@ -67,7 +67,6 @@ ERRSRC=		$(ROOT)/usr/platform/$(PLATFORM)/include/sys/sbd_ioctl.h
 
 all: $(LIBS)
 
-lint:   lintcheck
 
 # Create target directories
 $(USR_PSM_DIR):
@@ -101,6 +100,6 @@ pics/%.o: ../common/%.c
 	$(GENERRDIR)/sbdgenerr < $(ERRSRC) > ../common/ap_err.c
 
 sbdgenerr: $(GENERRDIR)/sbdgenerr.pl
-	$(RM) $(GENERRDIR)/sbdgenerr 
+	$(RM) $(GENERRDIR)/sbdgenerr
 	cat $(GENERRDIR)/sbdgenerr.pl > $(GENERRDIR)/sbdgenerr
 	$(CHMOD) +x $(GENERRDIR)/sbdgenerr
diff --git a/usr/src/lib/cfgadm_plugins/sbd/amd64/Makefile b/usr/src/lib/cfgadm_plugins/sbd/amd64/Makefile
index 9fd69cde68..568caf8aa5 100644
--- a/usr/src/lib/cfgadm_plugins/sbd/amd64/Makefile
+++ b/usr/src/lib/cfgadm_plugins/sbd/amd64/Makefile
@@ -32,7 +32,6 @@ include ../Makefile.com
 include ../../../Makefile.lib.64
 
 CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
-LINTFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 LDLIBS += -lscf
 
 .KEEP_STATE:
diff --git a/usr/src/lib/cfgadm_plugins/sbd/i386/Makefile b/usr/src/lib/cfgadm_plugins/sbd/i386/Makefile
index 7a382d291f..e4fe1d7fa5 100644
--- a/usr/src/lib/cfgadm_plugins/sbd/i386/Makefile
+++ b/usr/src/lib/cfgadm_plugins/sbd/i386/Makefile
@@ -31,7 +31,6 @@ PLATFORM = i86pc
 include ../Makefile.com
 
 CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
-LINTFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 LDLIBS += -lscf
 
 .KEEP_STATE:
diff --git a/usr/src/lib/cfgadm_plugins/scsi/Makefile b/usr/src/lib/cfgadm_plugins/scsi/Makefile
index 9b832a5972..b4abc1bf76 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/Makefile
+++ b/usr/src/lib/cfgadm_plugins/scsi/Makefile
@@ -35,7 +35,6 @@ clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 delete :=	TARGET= delete
 install :=	TARGET= install
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 package :=	TARGET= package
 
@@ -49,10 +48,11 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean delete install lint package: $(SUBDIRS)
+all clean delete install package: $(SUBDIRS)
 clobber: $(SUBDIRS)
 	$(RM) $(POFILE) $(POFILES)
 
+
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/cfgadm_plugins/scsi/Makefile.com b/usr/src/lib/cfgadm_plugins/scsi/Makefile.com
index 558f0327df..c54ed950a5 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/scsi/Makefile.com
@@ -53,7 +53,6 @@ LDLIBS +=	-lc -ldevice -ldevinfo -lrcm
 
 all:	$(LIBS)
 
-lint:   lintcheck
 
 # Install rules
 
diff --git a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile
index b8bd5148d6..4e201005ca 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile
+++ b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile
@@ -32,12 +32,11 @@ SUBDIRS= sparc sparcv9
 
 MSGSUBDIRS= $(SUBDIRS)
 
-all := 		TARGET= all
+all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 delete :=	TARGET= delete
 install :=	TARGET= install
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 package :=	TARGET= package
 
@@ -50,7 +49,8 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean clobber delete install lint package: $(SUBDIRS)
+all clean clobber delete install package: $(SUBDIRS)
+
 
 _msg:	$(MSGDOMAIN) $(POFILE)
 	$(RM) $(MSGDOMAIN)/$(POFILE)
diff --git a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com
index 6bd681a4a7..4563130b73 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com
@@ -60,7 +60,6 @@ LDLIBS +=	-lc -ldevice -ldevinfo -lrcm
 
 all:	$(LIBS)
 
-lint:   lintcheck
 
 # Install rules
 
diff --git a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparc/Makefile b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparc/Makefile
index c845c24bfc..72b59a12b2 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparc/Makefile
+++ b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparc/Makefile
@@ -22,14 +22,11 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 CFLAGS += -I../../common -I$(SRC)/uts/sun4u/opl
 
-LINTFLAGS += -I../../common -I$(SRC)/uts/sun4u/opl
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) 
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparcv9/Makefile b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparcv9/Makefile
index c05026a824..14f51ddbf2 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparcv9/Makefile
+++ b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparcv9/Makefile
@@ -22,15 +22,12 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 include ../../../../Makefile.lib.64
 CFLAGS64 += -I../../common -I$(SRC)/uts/sun4u/opl
 
-LINTFLAGS64 += -I../../common -I$(SRC)/uts/sun4u/opl
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) 
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/cfgadm_plugins/shp/Makefile b/usr/src/lib/cfgadm_plugins/shp/Makefile
index 416ab9dfcf..c477e91361 100644
--- a/usr/src/lib/cfgadm_plugins/shp/Makefile
+++ b/usr/src/lib/cfgadm_plugins/shp/Makefile
@@ -34,7 +34,6 @@ clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 delete :=	TARGET= delete
 install :=	TARGET= install
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 package :=	TARGET= package
 
@@ -48,10 +47,11 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean delete install lint package: $(SUBDIRS)
+all clean delete install package: $(SUBDIRS)
 clobber: $(SUBDIRS)
 	$(RM) $(POFILE) $(POFILES)
 
+
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/cfgadm_plugins/shp/Makefile.com b/usr/src/lib/cfgadm_plugins/shp/Makefile.com
index f870d9c700..c8a1a577c7 100644
--- a/usr/src/lib/cfgadm_plugins/shp/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/shp/Makefile.com
@@ -60,7 +60,6 @@ SMATCH=off
 
 all: $(LIBS)
 
-lint:   lintcheck
 
 # Create target directories
 $(USR_LIB_DIR):
diff --git a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile
index a71d4d781b..bd59a9e454 100644
--- a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile
+++ b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile
@@ -35,7 +35,6 @@ clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 delete :=	TARGET= delete
 install :=	TARGET= install
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 package :=	TARGET= package
 
@@ -49,7 +48,7 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean delete install lint package: $(SUBDIRS)
+all clean delete install package: $(SUBDIRS)
 clobber: $(SUBDIRS)
 	$(RM) $(POFILE) $(POFILES)
 
diff --git a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com
index 8fc548cc33..3e0a59b098 100644
--- a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com
@@ -64,8 +64,6 @@ SMATCH=off
 
 all: $(LIBS)
 
-lint:   lintcheck
-
 # Create target directories
 $(USR_PSM_DIR):		$(LINKED_DIRS)
 	-$(INS.dir)
diff --git a/usr/src/lib/cfgadm_plugins/usb/Makefile b/usr/src/lib/cfgadm_plugins/usb/Makefile
index 2e0731182d..b1a9874594 100644
--- a/usr/src/lib/cfgadm_plugins/usb/Makefile
+++ b/usr/src/lib/cfgadm_plugins/usb/Makefile
@@ -34,7 +34,6 @@ clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 delete :=	TARGET= delete
 install :=	TARGET= install
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 package :=	TARGET= package
 
@@ -48,7 +47,7 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean delete install lint package: $(SUBDIRS)
+all clean delete install package: $(SUBDIRS)
 clobber: $(SUBDIRS)
 	$(RM) $(POFILE) $(POFILES)
 
diff --git a/usr/src/lib/cfgadm_plugins/usb/Makefile.com b/usr/src/lib/cfgadm_plugins/usb/Makefile.com
index d1bb4af578..77df090945 100644
--- a/usr/src/lib/cfgadm_plugins/usb/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/usb/Makefile.com
@@ -38,8 +38,6 @@ ROOTLIBDIR64=	$(ROOTLIBDIR)/$(MACH64)
 
 LIBS=	$(DYNLIB)
 
-LINTFLAGS +=	-DDEBUG
-LINTFLAGS64 +=	-DDEBUG
 
 CFLAGS +=	$(CCVERBOSE)
 CFLAGS64 +=	$(CCVERBOSE)
@@ -58,8 +56,6 @@ LDLIBS +=	-lc -ldevice -ldevinfo -lrcm -lnvpair
 
 all:	$(LIBS)
 
-lint:   lintcheck
-
 # Install rules
 
 $(ROOTLIBDIR)/%: % $(ROOTLIBDIR)