6603582 nxge driver excludes i86xpv platform

--HG--
rename : usr/src/pkgdefs/SUNWnxge.i/Makefile => usr/src/pkgdefs/SUNWnxge/Makefile
rename : usr/src/pkgdefs/SUNWnxge.i/pkginfo.tmpl => usr/src/pkgdefs/SUNWnxge/pkginfo.tmpl
rename : usr/src/pkgdefs/SUNWnxge.i/postinstall => usr/src/pkgdefs/SUNWnxge/postinstall
rename : usr/src/pkgdefs/SUNWnxge.i/postremove => usr/src/pkgdefs/SUNWnxge/postremove
rename : usr/src/pkgdefs/SUNWnxge.i/prototype_com => usr/src/pkgdefs/SUNWnxge/prototype_com
rename : usr/src/pkgdefs/SUNWnxge.i/prototype_i386 => usr/src/pkgdefs/SUNWnxge/prototype_i386
rename : usr/src/uts/i86pc/nxge/Makefile => usr/src/uts/intel/nxge/Makefile

4 files changed, 9 insertions, 10 deletions

diff --git a/usr/src/uts/i86pc/Makefile b/usr/src/uts/i86pc/Makefile
index 9659a4c57f..3b6e7b11a6 100644
--- a/usr/src/uts/i86pc/Makefile
+++ b/usr/src/uts/i86pc/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -42,10 +42,9 @@ INTEL_LIB_DIR	 = $(UTSBASE)/intel/lint-libs/$(OBJS_DIR)
 
 INTEL_LINTS	 = genunix
 
-LINT_PARALLEL_KMODS	= $(PARALLEL_KMODS:nxge=)
 LINT_LIBS	 = $(LINT_LIB) \
 		   $(GENUNIX_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
-		   $(LINT_PARALLEL_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
+		   $(PARALLEL_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
 		   $(CLOSED_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
 		   $(INTEL_LINTS:%=$(INTEL_LIB_DIR)/llib-l%.ln)
 
diff --git a/usr/src/uts/i86pc/Makefile.i86pc.shared b/usr/src/uts/i86pc/Makefile.i86pc.shared
index 5c41559753..91411508f1 100644
--- a/usr/src/uts/i86pc/Makefile.i86pc.shared
+++ b/usr/src/uts/i86pc/Makefile.i86pc.shared
@@ -22,7 +22,7 @@
 #
 # uts/i86pc/Makefile.i86pc
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -241,7 +241,6 @@ DRV_KMODS	+= pcplusmp
 DRV_KMODS	+= cpc
 DRV_KMODS	+= pci
 DRV_KMODS	+= npe
-DRV_KMODS	+= nxge
 DRV_KMODS	+= pci-ide
 DRV_KMODS	+= xsvc
 DRV_KMODS	+= mc-amd
diff --git a/usr/src/uts/intel/Makefile.intel.shared b/usr/src/uts/intel/Makefile.intel.shared
index d132a3ac5a..d82da0c29e 100644
--- a/usr/src/uts/intel/Makefile.intel.shared
+++ b/usr/src/uts/intel/Makefile.intel.shared
@@ -263,6 +263,7 @@ DRV_KMODS_32	+= mscsi
 DRV_KMODS_32	+= msm
 DRV_KMODS	+= nca
 DRV_KMODS	+= nv_sata
+DRV_KMODS	+= nxge
 DRV_KMODS	+= openeepr
 DRV_KMODS	+= pci_pci
 DRV_KMODS	+= pcic
diff --git a/usr/src/uts/i86pc/nxge/Makefile b/usr/src/uts/intel/nxge/Makefile
index a001b6c7f7..fa480ba5e9 100644
--- a/usr/src/uts/i86pc/nxge/Makefile
+++ b/usr/src/uts/intel/nxge/Makefile
@@ -18,9 +18,9 @@
 #
 # CDDL HEADER END
 #
-# uts/i86pc/nxge/Makefile
+# uts/intel/nxge/Makefile
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #
@@ -41,13 +41,13 @@ MODULE		= nxge
 NXGE_OBJECTS =	$(NXGE_OBJS) $(NXGE_NPI_OBJS)
 OBJECTS		=  $(NXGE_OBJECTS:%=$(OBJS_DIR)/%)
 LINTS		= $(NXGE_OBJECTS:%.o=$(LINTS_DIR)/%.ln)
-ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
+ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/nxge
 
 #
 #	Include common rules.
 #
-include $(UTSBASE)/i86pc/Makefile.i86pc
+include $(UTSBASE)/intel/Makefile.intel
 
 #
 #	Override defaults to build a unique, local modstubs.o.
@@ -121,4 +121,4 @@ install:	$(INSTALL_DEPS)
 #
 #	Include common targets.
 #
-include $(UTSBASE)/i86pc/Makefile.targ
+include $(UTSBASE)/intel/Makefile.targ