--- a/src/gui/data/opensolaris.org	Mon Mar 30 11:12:18 2009 +0100
+++ b/src/gui/data/opensolaris.org	Mon Mar 30 10:16:37 2009 -0700
@@ -749,7 +749,7 @@
 category = Hardware
 
 [SUNWfcp]
-category = Ports
+category = Storage
 
 [SUNWfcprt]
 category = Hardware
@@ -758,7 +758,7 @@
 category = Storage
 
 [SUNWfctl]
-category = Ports
+category = Storage
 
 [SUNWfdhcm]
 category = Services

--- a/src/util/distro-import/00/common/SUNWfcp	Mon Mar 30 11:12:18 2009 +0100
+++ b/src/util/distro-import/00/common/SUNWfcp	Mon Mar 30 10:16:37 2009 -0700
@@ -1,5 +1,5 @@
 package SUNWfcp
-classification "Drivers/Ports"
+classification "Drivers/Storage"
 import SUNWfcp
-add driver name=fcp perm="* 0600 root sys"
+add driver name=fcp perms="* 0600 root sys"
 end package

--- a/src/util/distro-import/00/common/SUNWfcsm	Mon Mar 30 11:12:18 2009 +0100
+++ b/src/util/distro-import/00/common/SUNWfcsm	Mon Mar 30 10:16:37 2009 -0700
@@ -1,5 +1,5 @@
 package SUNWfcsm
 classification "Drivers/Storage"
 import SUNWfcsm
-add driver name=fcsm perm="* 0600 root sys"
+add driver name=fcsm perms="* 0600 root sys"
 end package

--- a/src/util/distro-import/00/common/SUNWfctl	Mon Mar 30 11:12:18 2009 +0100
+++ b/src/util/distro-import/00/common/SUNWfctl	Mon Mar 30 10:16:37 2009 -0700
@@ -1,5 +1,5 @@
 package SUNWfctl
-classification "Drivers/Ports"
+classification "Drivers/Storage"
 import SUNWfctl
-add driver name=fp perm="* 0600 root sys"
+add driver name=fp perms="* 0600 root sys"
 end package

--- a/src/util/distro-import/101a/common/SUNWemlxs	Mon Mar 30 11:12:18 2009 +0100
+++ b/src/util/distro-import/101a/common/SUNWemlxs	Mon Mar 30 10:16:37 2009 -0700
@@ -1,7 +1,7 @@
 package SUNWemlxs
 classification "Drivers/Storage"
 import SUNWemlxs
-add driver name=emlxs perms="* 0600 root sys'" class=fibre-channel \
+add driver name=emlxs perms="* 0600 root sys" class=fibre-channel \
 	alias=pci10df,fc00 \
 	alias=pci10df,f800 \
 	alias=pci10df,f900 \

--- a/src/util/distro-import/111/common/SUNWckr	Mon Mar 30 11:12:18 2009 +0100
+++ b/src/util/distro-import/111/common/SUNWckr	Mon Mar 30 10:16:37 2009 -0700
@@ -28,7 +28,7 @@
 add driver name=vnic perms="* 0666 root sys" \
 	clone_perms="0666 root sys" \
 	policy="read_priv_set=net_rawaccess write_priv_set=net_rawaccess"
-add driver name=acpi_drv perms="* 0666 root sys"
+$(i386_ONLY)add driver name=acpi_drv perms="* 0666 root sys"
 add driver name=scsi_vhci perms="* 0666 root sys" \
 	class=scsi-self-identifying policy="devctl write_priv_set=sys_devices"
 add driver name=aggr perms="* 0666 root sys" \