PSARC/2007/045 I2O EOL and EOF

4863632 Hey Hey!  Ho Ho!  I2O Has Got to Go!

--HG--
rename : usr/src/uts/common/io/i2o/i2o_bs.c => deleted_files/usr/src/uts/common/io/i2o/i2o_bs.c
rename : usr/src/uts/common/io/i2o/i2o_bs.conf => deleted_files/usr/src/uts/common/io/i2o/i2o_bs.conf
rename : usr/src/uts/common/io/i2o/i2o_bs.h => deleted_files/usr/src/uts/common/io/i2o/i2o_bs.h
rename : usr/src/uts/common/io/i2o/i2o_impl.h => deleted_files/usr/src/uts/common/io/i2o/i2o_impl.h
rename : usr/src/uts/common/io/i2o/i2o_msg.c => deleted_files/usr/src/uts/common/io/i2o/i2o_msg.c
rename : usr/src/uts/common/io/i2o/i2o_scsi.c => deleted_files/usr/src/uts/common/io/i2o/i2o_scsi.c
rename : usr/src/uts/common/io/i2o/i2o_scsi.conf => deleted_files/usr/src/uts/common/io/i2o/i2o_scsi.conf
rename : usr/src/uts/common/io/i2o/i2o_scsi_cmd.h => deleted_files/usr/src/uts/common/io/i2o/i2o_scsi_cmd.h
rename : usr/src/uts/common/io/i2o/i2o_scsi_util.h => deleted_files/usr/src/uts/common/io/i2o/i2o_scsi_util.h
rename : usr/src/uts/common/io/i2o/i2o_scsi_var.h => deleted_files/usr/src/uts/common/io/i2o/i2o_scsi_var.h
rename : usr/src/uts/common/io/i2o/label.c => deleted_files/usr/src/uts/common/io/i2o/label.c
rename : usr/src/uts/common/io/i2o/pci_to_i2o.c => deleted_files/usr/src/uts/common/io/i2o/pci_to_i2o.c
rename : usr/src/uts/common/io/i2o/pci_to_i2o.conf => deleted_files/usr/src/uts/common/io/i2o/pci_to_i2o.conf
rename : usr/src/uts/common/sys/i2o/i2oadptr.h => deleted_files/usr/src/uts/common/sys/i2o/i2oadptr.h
rename : usr/src/uts/common/sys/i2o/i2obscsi.h => deleted_files/usr/src/uts/common/sys/i2o/i2obscsi.h
rename : usr/src/uts/common/sys/i2o/i2oexec.h => deleted_files/usr/src/uts/common/sys/i2o/i2oexec.h
rename : usr/src/uts/common/sys/i2o/i2omsg.h => deleted_files/usr/src/uts/common/sys/i2o/i2omsg.h
rename : usr/src/uts/common/sys/i2o/i2omstr.h => deleted_files/usr/src/uts/common/sys/i2o/i2omstr.h
rename : usr/src/uts/common/sys/i2o/i2outil.h => deleted_files/usr/src/uts/common/sys/i2o/i2outil.h
rename : usr/src/uts/intel/i2o_bs/Makefile => deleted_files/usr/src/uts/intel/i2o_bs/Makefile
rename : usr/src/uts/intel/i2o_msg/Makefile => deleted_files/usr/src/uts/intel/i2o_msg/Makefile
rename : usr/src/uts/intel/i2o_scsi/Makefile => deleted_files/usr/src/uts/intel/i2o_scsi/Makefile
rename : usr/src/uts/intel/pci_to_i2o/Makefile => deleted_files/usr/src/uts/intel/pci_to_i2o/Makefile

40 files changed, 49 insertions, 70 deletions

diff --git a/usr/src/uts/common/io/i2o/i2o_bs.c b/deleted_files/usr/src/uts/common/io/i2o/i2o_bs.c
index dc6876a3c1..dc6876a3c1 100644
--- a/usr/src/uts/common/io/i2o/i2o_bs.c
+++ b/deleted_files/usr/src/uts/common/io/i2o/i2o_bs.c
diff --git a/usr/src/uts/common/io/i2o/i2o_bs.conf b/deleted_files/usr/src/uts/common/io/i2o/i2o_bs.conf
index 9445c9b6ba..9445c9b6ba 100644
--- a/usr/src/uts/common/io/i2o/i2o_bs.conf
+++ b/deleted_files/usr/src/uts/common/io/i2o/i2o_bs.conf
diff --git a/usr/src/uts/common/io/i2o/i2o_bs.h b/deleted_files/usr/src/uts/common/io/i2o/i2o_bs.h
index 73b26a553f..73b26a553f 100644
--- a/usr/src/uts/common/io/i2o/i2o_bs.h
+++ b/deleted_files/usr/src/uts/common/io/i2o/i2o_bs.h
diff --git a/usr/src/uts/common/io/i2o/i2o_impl.h b/deleted_files/usr/src/uts/common/io/i2o/i2o_impl.h
index db06469cb7..db06469cb7 100644
--- a/usr/src/uts/common/io/i2o/i2o_impl.h
+++ b/deleted_files/usr/src/uts/common/io/i2o/i2o_impl.h
diff --git a/usr/src/uts/common/io/i2o/i2o_msg.c b/deleted_files/usr/src/uts/common/io/i2o/i2o_msg.c
index 4066433e75..4066433e75 100644
--- a/usr/src/uts/common/io/i2o/i2o_msg.c
+++ b/deleted_files/usr/src/uts/common/io/i2o/i2o_msg.c
diff --git a/usr/src/uts/common/io/i2o/i2o_scsi.c b/deleted_files/usr/src/uts/common/io/i2o/i2o_scsi.c
index b880390574..b880390574 100644
--- a/usr/src/uts/common/io/i2o/i2o_scsi.c
+++ b/deleted_files/usr/src/uts/common/io/i2o/i2o_scsi.c
diff --git a/usr/src/uts/common/io/i2o/i2o_scsi.conf b/deleted_files/usr/src/uts/common/io/i2o/i2o_scsi.conf
index 61ac569654..61ac569654 100644
--- a/usr/src/uts/common/io/i2o/i2o_scsi.conf
+++ b/deleted_files/usr/src/uts/common/io/i2o/i2o_scsi.conf
diff --git a/usr/src/uts/common/io/i2o/i2o_scsi_cmd.h b/deleted_files/usr/src/uts/common/io/i2o/i2o_scsi_cmd.h
index abb46497a3..abb46497a3 100644
--- a/usr/src/uts/common/io/i2o/i2o_scsi_cmd.h
+++ b/deleted_files/usr/src/uts/common/io/i2o/i2o_scsi_cmd.h
diff --git a/usr/src/uts/common/io/i2o/i2o_scsi_util.h b/deleted_files/usr/src/uts/common/io/i2o/i2o_scsi_util.h
index fc06159842..fc06159842 100644
--- a/usr/src/uts/common/io/i2o/i2o_scsi_util.h
+++ b/deleted_files/usr/src/uts/common/io/i2o/i2o_scsi_util.h
diff --git a/usr/src/uts/common/io/i2o/i2o_scsi_var.h b/deleted_files/usr/src/uts/common/io/i2o/i2o_scsi_var.h
index 410ffe972c..410ffe972c 100644
--- a/usr/src/uts/common/io/i2o/i2o_scsi_var.h
+++ b/deleted_files/usr/src/uts/common/io/i2o/i2o_scsi_var.h
diff --git a/usr/src/uts/common/io/i2o/label.c b/deleted_files/usr/src/uts/common/io/i2o/label.c
index aeaefff448..aeaefff448 100644
--- a/usr/src/uts/common/io/i2o/label.c
+++ b/deleted_files/usr/src/uts/common/io/i2o/label.c
diff --git a/usr/src/uts/common/io/i2o/pci_to_i2o.c b/deleted_files/usr/src/uts/common/io/i2o/pci_to_i2o.c
index 0dc8105d0e..0dc8105d0e 100644
--- a/usr/src/uts/common/io/i2o/pci_to_i2o.c
+++ b/deleted_files/usr/src/uts/common/io/i2o/pci_to_i2o.c
diff --git a/usr/src/uts/common/io/i2o/pci_to_i2o.conf b/deleted_files/usr/src/uts/common/io/i2o/pci_to_i2o.conf
index 73b57c346e..73b57c346e 100644
--- a/usr/src/uts/common/io/i2o/pci_to_i2o.conf
+++ b/deleted_files/usr/src/uts/common/io/i2o/pci_to_i2o.conf
diff --git a/usr/src/uts/common/sys/i2o/i2oadptr.h b/deleted_files/usr/src/uts/common/sys/i2o/i2oadptr.h
index 0dd0f70801..0dd0f70801 100644
--- a/usr/src/uts/common/sys/i2o/i2oadptr.h
+++ b/deleted_files/usr/src/uts/common/sys/i2o/i2oadptr.h
diff --git a/usr/src/uts/common/sys/i2o/i2obscsi.h b/deleted_files/usr/src/uts/common/sys/i2o/i2obscsi.h
index 8cb3d33338..8cb3d33338 100644
--- a/usr/src/uts/common/sys/i2o/i2obscsi.h
+++ b/deleted_files/usr/src/uts/common/sys/i2o/i2obscsi.h
diff --git a/usr/src/uts/common/sys/i2o/i2oexec.h b/deleted_files/usr/src/uts/common/sys/i2o/i2oexec.h
index 9dfb92dba2..9dfb92dba2 100644
--- a/usr/src/uts/common/sys/i2o/i2oexec.h
+++ b/deleted_files/usr/src/uts/common/sys/i2o/i2oexec.h
diff --git a/usr/src/uts/common/sys/i2o/i2omsg.h b/deleted_files/usr/src/uts/common/sys/i2o/i2omsg.h
index bad40e2733..bad40e2733 100644
--- a/usr/src/uts/common/sys/i2o/i2omsg.h
+++ b/deleted_files/usr/src/uts/common/sys/i2o/i2omsg.h
diff --git a/usr/src/uts/common/sys/i2o/i2omstr.h b/deleted_files/usr/src/uts/common/sys/i2o/i2omstr.h
index 3065c8c2f5..3065c8c2f5 100644
--- a/usr/src/uts/common/sys/i2o/i2omstr.h
+++ b/deleted_files/usr/src/uts/common/sys/i2o/i2omstr.h
diff --git a/usr/src/uts/common/sys/i2o/i2outil.h b/deleted_files/usr/src/uts/common/sys/i2o/i2outil.h
index a3bbd40267..a3bbd40267 100644
--- a/usr/src/uts/common/sys/i2o/i2outil.h
+++ b/deleted_files/usr/src/uts/common/sys/i2o/i2outil.h
diff --git a/usr/src/uts/intel/i2o_bs/Makefile b/deleted_files/usr/src/uts/intel/i2o_bs/Makefile
index 279336cf97..279336cf97 100644
--- a/usr/src/uts/intel/i2o_bs/Makefile
+++ b/deleted_files/usr/src/uts/intel/i2o_bs/Makefile
diff --git a/usr/src/uts/intel/i2o_msg/Makefile b/deleted_files/usr/src/uts/intel/i2o_msg/Makefile
index dcf2612a2d..dcf2612a2d 100644
--- a/usr/src/uts/intel/i2o_msg/Makefile
+++ b/deleted_files/usr/src/uts/intel/i2o_msg/Makefile
diff --git a/usr/src/uts/intel/i2o_scsi/Makefile b/deleted_files/usr/src/uts/intel/i2o_scsi/Makefile
index b0ec7f4113..b0ec7f4113 100644
--- a/usr/src/uts/intel/i2o_scsi/Makefile
+++ b/deleted_files/usr/src/uts/intel/i2o_scsi/Makefile
diff --git a/usr/src/uts/intel/pci_to_i2o/Makefile b/deleted_files/usr/src/uts/intel/pci_to_i2o/Makefile
index 13d7c67aa2..13d7c67aa2 100644
--- a/usr/src/uts/intel/pci_to_i2o/Makefile
+++ b/deleted_files/usr/src/uts/intel/pci_to_i2o/Makefile
diff --git a/usr/src/pkgdefs/SUNWckr/prototype_i386 b/usr/src/pkgdefs/SUNWckr/prototype_i386
index c3288ad2a8..428d48a488 100644
--- a/usr/src/pkgdefs/SUNWckr/prototype_i386
+++ b/usr/src/pkgdefs/SUNWckr/prototype_i386
@@ -79,10 +79,6 @@ f none kernel/drv/crypto 755 root sys
 f none kernel/drv/cryptoadm 755 root sys
 f none kernel/drv/devinfo 755 root sys
 f none kernel/drv/dld 755 root sys
-f none kernel/drv/i2o_bs 755 root sys
-f none kernel/drv/i2o_bs.conf 644 root sys
-f none kernel/drv/i2o_scsi 755 root sys
-f none kernel/drv/i2o_scsi.conf 644 root sys
 f none kernel/drv/i8042 755 root sys
 f none kernel/drv/icmp 755 root sys
 f none kernel/drv/icmp6 755 root sys
@@ -106,8 +102,6 @@ f none kernel/drv/mouse8042 755 root sys
 f none kernel/drv/openeepr 755 root sys
 f none kernel/drv/options 755 root sys
 f none kernel/drv/pci_pci 755 root sys
-f none kernel/drv/pci_to_i2o 755 root sys
-f none kernel/drv/pci_to_i2o.conf 644 root sys
 f none kernel/drv/pcie_pci 755 root sys
 f none kernel/drv/pcie_pci.conf 644 root sys
 f none kernel/drv/physmem 755 root sys
@@ -181,7 +175,6 @@ f none kernel/misc/fssnap_if 755 root sys
 f none kernel/misc/gld 755 root sys
 f none kernel/misc/hook 755 root sys
 f none kernel/misc/hpcsvc 755 root sys
-f none kernel/misc/i2o_msg 755 root sys
 f none kernel/misc/ipc 755 root sys
 f none kernel/misc/kbtrans 755 root sys
 f none kernel/misc/kcf 755 root sys
diff --git a/usr/src/pkgdefs/SUNWhea/prototype_i386 b/usr/src/pkgdefs/SUNWhea/prototype_i386
index 4fafdc6e72..3945fe8745 100644
--- a/usr/src/pkgdefs/SUNWhea/prototype_i386
+++ b/usr/src/pkgdefs/SUNWhea/prototype_i386
@@ -85,13 +85,6 @@ f none usr/include/sys/dktp/dadkio.h 644 root bin
 f none usr/include/sys/dktp/fdisk.h 644 root bin
 f none usr/include/sys/dma_engine.h 644 root bin
 f none usr/include/sys/fp.h 644 root bin
-d none usr/include/sys/i2o 755 root bin
-f none usr/include/sys/i2o/i2omsg.h 644 root bin
-f none usr/include/sys/i2o/i2outil.h 644 root bin
-f none usr/include/sys/i2o/i2oexec.h 644 root bin
-f none usr/include/sys/i2o/i2oadptr.h 644 root bin
-f none usr/include/sys/i2o/i2obscsi.h 644 root bin
-f none usr/include/sys/i2o/i2omstr.h 644 root bin
 f none usr/include/sys/i8272A.h 644 root bin
 f none usr/include/sys/kd.h 644 root bin
 f none usr/include/sys/mc.h 644 root bin
diff --git a/usr/src/pkgdefs/common_files/i.drvalias b/usr/src/pkgdefs/common_files/i.drvalias
index d630cb49d3..0dd7c5c391 100644
--- a/usr/src/pkgdefs/common_files/i.drvalias
+++ b/usr/src/pkgdefs/common_files/i.drvalias
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -159,7 +159,9 @@ obsolete_i386() {
 	    -e '/^[ 	]*smartii[ 	][ 	]*"pcie11,4030"$/d' \
 	    -e '/^[ 	]*smartii[ 	][ 	]*"pcie11,4030"[ 	#].*$/d' \
 	    -e '/^[ 	]*smartii[ 	][ 	]*"pcie11,4031"$/d' \
-	    -e '/^[ 	]*smartii[ 	][ 	]*"pcie11,4031"[ 	#].*$/d'
+	    -e '/^[ 	]*smartii[ 	][ 	]*"pcie11,4031"[ 	#].*$/d' \
+	    -e '/^[ 	]*pci_to_i2o[ 	][ 	]*"pciclass,0e0001"$/d' \
+	    -e '/^[ 	]*pci_to_i2o[ 	][ 	]*"pciclass,0e0001"[ 	#].*$/d'
 }
 
 #
diff --git a/usr/src/pkgdefs/common_files/i.kclasses_i386 b/usr/src/pkgdefs/common_files/i.kclasses_i386
index 045db691d7..096a5552fa 100644
--- a/usr/src/pkgdefs/common_files/i.kclasses_i386
+++ b/usr/src/pkgdefs/common_files/i.kclasses_i386
@@ -66,6 +66,8 @@ do
 		    -e '/^trantor[	].*scsi/d' \
 		    -e '/^corvette[	].*scsi/d' \
 		    -e '/^mpt[	].*scsi/d' \
+		    -e '/^pci_to_i2o[	].*i2o/d' \
+		    -e '/^i2o_scsi[	].*scsi/d' \
 		$dest > /tmp/c.$$
 		if cmp -s /tmp/c.$$ $dest  > /dev/null 2>&1
 		then
@@ -89,14 +91,6 @@ do
 		if [ $? != 0 ] ; then
 			echo 'mscsi scsi' >> $dest
 		fi
-		grep '^pci_to_i2o[ 	].*i2o' $dest > /dev/null 2>&1
-		if [ $? != 0 ] ; then
-			echo 'pci_to_i2o i2o' >> $dest
-		fi
-		grep '^i2o_scsi[ 	].*scsi' $dest > /dev/null 2>&1
-		if [ $? != 0 ] ; then
-			echo 'i2o_scsi scsi' >> $dest
-		fi
 	fi
 done
 
diff --git a/usr/src/pkgdefs/common_files/i.minorperm_i386 b/usr/src/pkgdefs/common_files/i.minorperm_i386
index 378f3983a2..7cbd731764 100644
--- a/usr/src/pkgdefs/common_files/i.minorperm_i386
+++ b/usr/src/pkgdefs/common_files/i.minorperm_i386
@@ -159,6 +159,7 @@ cmtp:*
 profile:profile
 asy:[a-z]
 asy:[a-z],cu
+i2o_bs:*
 EOF
 }
 
@@ -180,7 +181,6 @@ tnf:tnfmap
 st:*
 pm:*
 devinfo:devinfo
-i2o_bs:*
 openeepr:openprom
 wc:*
 ip:ip
diff --git a/usr/src/pkgdefs/common_files/i.nametomajor b/usr/src/pkgdefs/common_files/i.nametomajor
index 1a9fa954cc..000093b23e 100644
--- a/usr/src/pkgdefs/common_files/i.nametomajor
+++ b/usr/src/pkgdefs/common_files/i.nametomajor
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -175,6 +175,9 @@ obsolete_i386()
 		obs["tiqmouse"] = 1;
 		obs["tr"] = 1;
 		obs["trantor"] = 1;
+		obs["pci_to_i2o"] = 1;
+		obs["i2o_scsi"] = 1;
+		obs["i2o_bs"] = 1;
 	} !($1 in obs) { print $0 }'
 }
 
diff --git a/usr/src/tools/scripts/bfu.sh b/usr/src/tools/scripts/bfu.sh
index fc7b973d5b..3ab3378455 100644
--- a/usr/src/tools/scripts/bfu.sh
+++ b/usr/src/tools/scripts/bfu.sh
@@ -6584,6 +6584,19 @@ mondo_loop() {
 	#
 	rm -f $root/dev/cfg/*pci*
 
+	#
+	# Remove I2O.
+	#
+	rm -f $root/kernel/drv/i2o_bs
+	rm -f $root/kernel/drv/i2o_bs.conf
+	rm -f $root/kernel/drv/i2o_scsi
+	rm -f $root/kernel/drv/i2o_scsi.conf
+	rm -f $root/kernel/drv/pci_to_i2o
+	rm -f $root/kernel/drv/pci_to_i2o.conf
+	rm -f $root/kernel/misc/i2o_msg
+	rm -f $root/usr/include/sys/i2o/*
+	rmdir $root/usr/include/sys/i2o/ 2>/dev/null
+
 	# End of pre-archive extraction hacks.
 
 	if [ $diskless = no -a $zone = global ]; then
diff --git a/usr/src/uts/common/Makefile.files b/usr/src/uts/common/Makefile.files
index da42d5e51d..af1f0d5137 100644
--- a/usr/src/uts/common/Makefile.files
+++ b/usr/src/uts/common/Makefile.files
@@ -1273,14 +1273,6 @@ PCWL_OBJS += pcwl.o
 
 PSET_OBJS +=	pset.o
 
-PCI_I2ONEXUS_OBJS += pci_to_i2o.o
-
-I2OMSG_OBJS += i2o_msg.o
-
-I2O_SCSI_OBJS += i2o_scsi.o
-
-I2O_BS_OBJS += i2o_bs.o label.o
-
 OHCI_OBJS += ohci.o ohci_hub.o ohci_polled.o
 
 UHCI_OBJS += uhci.o uhciutil.o uhcitgt.o uhcihub.o uhcipolled.o
diff --git a/usr/src/uts/common/Makefile.rules b/usr/src/uts/common/Makefile.rules
index 76abd6c846..7b732ca525 100644
--- a/usr/src/uts/common/Makefile.rules
+++ b/usr/src/uts/common/Makefile.rules
@@ -495,10 +495,6 @@ $(OBJS_DIR)/%.o:		$(UTSBASE)/common/io/hotplug/pcihp/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
 
-$(OBJS_DIR)/%.o:		$(UTSBASE)/common/io/i2o/%.c
-	$(COMPILE.c) -o $@ $<
-	$(CTFCONVERT_O)
-
 $(OBJS_DIR)/%.o:		$(UTSBASE)/common/io/ib/clients/rds/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
@@ -1291,9 +1287,6 @@ $(LINTS_DIR)/%.ln:		$(UTSBASE)/common/io/hotplug/pcishpc/%.c
 $(LINTS_DIR)/%.ln:		$(UTSBASE)/common/io/hotplug/pcihp/%.c
 	@($(LHEAD) $(LINT.c) $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/common/io/i2o/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
 $(LINTS_DIR)/%.ln:		$(UTSBASE)/common/io/ib/clients/rds/%.c
 	@($(LHEAD) $(LINT.c) $< $(LTAIL))
 
diff --git a/usr/src/uts/common/sys/Makefile b/usr/src/uts/common/sys/Makefile
index c00a178991..6b1b5bb8c3 100644
--- a/usr/src/uts/common/sys/Makefile
+++ b/usr/src/uts/common/sys/Makefile
@@ -934,15 +934,6 @@ PCHDRS=			\
 	pit.h		\
 	rtc.h
 
-# I2O header files (currently used only on i386)
-I2OHDRS=		\
-	i2oadptr.h	\
-	i2obscsi.h	\
-	i2oexec.h	\
-	i2omsg.h	\
-	i2omstr.h	\
-	i2outil.h
-
 NXGEHDRS=			\
 	nxge.h			\
 	nxge_common.h		\
diff --git a/usr/src/uts/common/sys/Makefile.syshdrs b/usr/src/uts/common/sys/Makefile.syshdrs
index 6aa0c8e295..26970f5219 100644
--- a/usr/src/uts/common/sys/Makefile.syshdrs
+++ b/usr/src/uts/common/sys/Makefile.syshdrs
@@ -1,5 +1,24 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -129,7 +148,7 @@ sparc_ROOTDIRS=	$(ROOTDKTPDIR) $(ROOTDIR)/scsi/adapters \
 		$(ROOTDIR)/av
 
 i386_ROOTDIRS=	$(ROOTDKTPDIR) $(ROOTDIR)/scsi/adapters $(ROOTDIR)/scsi/targets \
-		$(ROOTDIR)/i2o $(ROOTDIR)/agp $(ROOTDIR)/sata
+		$(ROOTDIR)/agp $(ROOTDIR)/sata
 
 ROOTDIRS=			\
 	$(ROOTDIR)		\
@@ -244,7 +263,6 @@ ROOTRSMHDRS= $(RSMHDRS:%=$(ROOTDIR)/rsm/%)
 ROOTSDKTPHDRS= $(SDKTPHDRS:%=$(ROOTDIR)/dktp/%)
 ROOTDKTPHDRS= $(DKTPHDRS:%=$(ROOTDIR)/dktp/%)
 ROOTPCHDRS= $(PCHDRS:%=$(ROOTDIR)/%)
-ROOTI2OHDRS= $(I2OHDRS:%=$(ROOTDIR)/i2o/%)
 ROOTHOTPLUGHDRS= $(HOTPLUGHDRS:%=$(ROOTDIR)/hotplug/%)
 ROOTHOTPLUGPCIHDRS= $(HOTPLUGPCIHDRS:%=$(ROOTDIR)/hotplug/pci/%)
 
@@ -258,7 +276,7 @@ sparc_ROOTHDRS=	$(ROOTSDKTPHDRS) $(ROOTSCSICADHDRS) $(ROOTSCSITARGETSHDRS) \
 
 i386_ROOTHDRS=	$(ROOTDKTPHDRS) $(ROOTPCHDRS) $(ROOTSCSITARGETSHDRS)	\
 		$(ROOTSCSIVHCIHDRS) $(ROOTFCHDRS)	\
-		$(ROOTI2OHDRS) $(ROOTPCMCIAHDRS) $(ROOTHOTPLUGHDRS) \
+		$(ROOTPCMCIAHDRS) $(ROOTHOTPLUGHDRS) \
 		$(ROOTHOTPLUGPCIHDRS) $(ROOTSATAGENHDRS)
 
 # install rules
diff --git a/usr/src/uts/intel/Makefile.intel.shared b/usr/src/uts/intel/Makefile.intel.shared
index c93b5d3203..f3c5f47b7a 100644
--- a/usr/src/uts/intel/Makefile.intel.shared
+++ b/usr/src/uts/intel/Makefile.intel.shared
@@ -379,11 +379,6 @@ $(CLOSED_BUILD)CLOSED_DRV_KMODS	+= pcelx
 $(CLOSED_BUILD)CLOSED_DRV_KMODS	+= pcser
 
 #
-#	I2O specific module(s)
-#
-DRV_KMODS_32	+= pci_to_i2o i2o_bs i2o_scsi
-
-#
 #	SCSI Enclosure Services driver
 #
 DRV_KMODS	+= ses
@@ -517,7 +512,6 @@ MISC_KMODS	+= gld
 MISC_KMODS	+= hidparser
 MISC_KMODS	+= hook
 MISC_KMODS	+= hpcsvc
-MISC_KMODS_32	+= i2o_msg
 MISC_KMODS	+= ibcm
 MISC_KMODS	+= ibdm
 MISC_KMODS	+= ibmf
diff --git a/usr/src/uts/intel/os/driver_aliases b/usr/src/uts/intel/os/driver_aliases
index 8092ae9065..cded87929e 100644
--- a/usr/src/uts/intel/os/driver_aliases
+++ b/usr/src/uts/intel/os/driver_aliases
@@ -6,7 +6,6 @@ pci_pci "pciclass,060401"
 pci_pci "pci1011,1"
 pci_pci "pci1011,21"
 pci_pci "pci1014,22"
-pci_to_i2o "pciclass,0e0001"
 kb8042 "pnpPNP,303"
 mouse8042 "pnpPNP,f03"
 vgatext "pnpPNP,900"
diff --git a/usr/src/uts/intel/os/driver_classes b/usr/src/uts/intel/os/driver_classes
index 637129b3e5..90ad0e4f92 100644
--- a/usr/src/uts/intel/os/driver_classes
+++ b/usr/src/uts/intel/os/driver_classes
@@ -29,5 +29,3 @@ isa	sysbus
 eisa	sysbus
 pci	pci
 pci_pci	pci
-pci_to_i2o i2o
-i2o_scsi scsi
diff --git a/usr/src/uts/intel/os/minor_perm b/usr/src/uts/intel/os/minor_perm
index d1b263d3ae..56574d259b 100644
--- a/usr/src/uts/intel/os/minor_perm
+++ b/usr/src/uts/intel/os/minor_perm
@@ -89,7 +89,6 @@ vol:volctl 0666 root sys
 tnf:tnfctl 0600 root sys
 tnf:tnfmap 0600 root sys
 pm:* 0666 root sys
-i2o_bs:* 0640 root sys
 wc:* 0600 root sys
 poll:* 0666 root sys
 cpc:shared 0666 root sys
diff --git a/usr/src/uts/intel/os/name_to_major b/usr/src/uts/intel/os/name_to_major
index ec127e3e43..0d8c92bff2 100644
--- a/usr/src/uts/intel/os/name_to_major
+++ b/usr/src/uts/intel/os/name_to_major
@@ -65,9 +65,6 @@ tnf 128
 st 129
 mscsi 130
 pm 131
-pci_to_i2o 132
-i2o_scsi 133
-i2o_bs 134
 poll 135
 keysock 136
 ipsecah 137
diff --git a/usr/src/uts/intel/ses/Makefile b/usr/src/uts/intel/ses/Makefile
index 7bb902425e..13af293aa7 100644
--- a/usr/src/uts/intel/ses/Makefile
+++ b/usr/src/uts/intel/ses/Makefile
@@ -21,13 +21,13 @@
 #
 # uts/intel/ses/Makefile
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
 #
-#	This makefile drives the production of the i2o_bs (I2O BS-OSM)
-#	driver kernel module.
+#	This makefile drives the production of the ses (SCSI enclosure
+#	services) driver kernel module.
 #
 #	intel implementation architecture dependent
 #