summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/man/man7d/Makefile2
-rw-r--r--usr/src/pkg/manifests/driver-network-pcn.mf2
-rw-r--r--usr/src/pkg/manifests/driver-network-platform.mf10
3 files changed, 4 insertions, 10 deletions
diff --git a/usr/src/man/man7d/Makefile b/usr/src/man/man7d/Makefile
index 83ecc98fcc..81fd702ed1 100644
--- a/usr/src/man/man7d/Makefile
+++ b/usr/src/man/man7d/Makefile
@@ -93,7 +93,6 @@ COMMON_MANFILES = aac.7d \
pcata.7d \
pcic.7d \
pcmcia.7d \
- pcn.7d \
pcwl.7d \
physmem.7d \
pm.7d \
@@ -217,6 +216,7 @@ i386_MANFILES = ahci.7d \
npe.7d \
ntxn.7d \
nv_sata.7d \
+ pcn.7d \
radeon.7d \
ral.7d \
rtw.7d \
diff --git a/usr/src/pkg/manifests/driver-network-pcn.mf b/usr/src/pkg/manifests/driver-network-pcn.mf
index 1dab7c6c8d..458b494b71 100644
--- a/usr/src/pkg/manifests/driver-network-pcn.mf
+++ b/usr/src/pkg/manifests/driver-network-pcn.mf
@@ -34,7 +34,7 @@ set name=pkg.description value="PCnet Fast Ethernet Network Adapter Driver"
set name=pkg.summary value="PCnet Ethernet Driver"
set name=info.classification \
value=org.opensolaris.category.2008:Drivers/Networking
-set name=variant.arch value=$(ARCH)
+set name=variant.arch value=i386
dir path=kernel group=sys
dir path=kernel/drv group=sys
dir path=kernel/drv/$(ARCH64) group=sys
diff --git a/usr/src/pkg/manifests/driver-network-platform.mf b/usr/src/pkg/manifests/driver-network-platform.mf
index d553832f6b..e33159e615 100644
--- a/usr/src/pkg/manifests/driver-network-platform.mf
+++ b/usr/src/pkg/manifests/driver-network-platform.mf
@@ -50,15 +50,10 @@ driver name=dnet clone_perms="dnet 0666 root sys" perms="* 0666 root sys" \
alias=pci1109,1400 \
alias=pci1109,2400 \
alias=pci2646,1
-driver name=pcn clone_perms="pcn 0666 root sys" perms="* 0666 root sys" \
- alias=pci1022,2000 \
- alias=pci103c,104c
file path=etc/bootrc group=sys mode=0755
file path=etc/mach group=sys original_name=SUNWos86r:etc/mach preserve=true
file path=kernel/drv/$(ARCH64)/dnet group=sys
-file path=kernel/drv/$(ARCH64)/pcn group=sys
file path=kernel/drv/dnet group=sys
-file path=kernel/drv/pcn group=sys
file path=kernel/drv/sd group=sys
file path=kernel/drv/sd.conf group=sys \
original_name=SUNWos86r:kernel/drv/sd.conf preserve=true
@@ -67,10 +62,9 @@ legacy pkg=SUNWos86r desc="Platform Support, OS Functionality (Root)" \
name="Platform Support, OS Functionality (Root)"
license cr_Sun license=cr_Sun
license lic_CDDL license=lic_CDDL
-# when pcn is removed, we can remove the OSBL as well
-license lic_OSBL license=lic_OSBL
-license lic_OSBL_preamble license=lic_OSBL_preamble
# elxl moved out of this package, so create a dependency for upgraded systems
depend fmri=driver/network/elxl type=require
# iprb moved out of this package, so create a dependency for upgraded systems
depend fmri=driver/network/iprb type=require
+# pcn moved out of this package, so create a dependency for upgraded systems
+depend fmri=driver/network/pcn type=require