diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-19 12:30:49 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-19 12:30:49 +0000 |
| commit | 77d478ddacb21ab351a7726510b1d81236125173 (patch) | |
| tree | 025730985044627844ef7bc2adbaaf3f7be611e5 /usr/src/uts/intel/io | |
| parent | 0c627058c79e5867b47468553d9ec113f2616984 (diff) | |
| parent | 66582b606a8194f7f3ba5b3a3a6dca5b0d346361 (diff) | |
| download | illumos-joyent-77d478ddacb21ab351a7726510b1d81236125173.tar.gz | |
[illumos-gate merge]
commit 66582b606a8194f7f3ba5b3a3a6dca5b0d346361
12185 Remove B100s support
commit e912cc3d5decbbfbb3005d9f678e9fc3ccbcf91f
12314 ld fatal warnings miss some guidance messages
commit 20de283b9b1939fdc5b617ccc0c6e5ce8b7c6160
12313 nightly should check for ld guidance
commit f365545469641697196ce86d635cfe5f3fe68d27
12312 fix unused lib dependencies
commit 3e3015ce0eb82be8ac17954eba80f3f24204fcbd
12311 adjust NATIVE_LIBS in SMF makefiles
commit ced75a9309169d0177775214e3e1780ef5f7cf8a
12293 libfru: SOLARIS_UNIX is not needed
commit e371214c989050b68785a50c83f96cd04c4d18e8
12233 libsmbios fails to build on SPARC
Conflicts:
usr/src/man/man7d/Makefile
usr/src/cmd/svc/configd/Makefile
Diffstat (limited to 'usr/src/uts/intel/io')
| -rw-r--r-- | usr/src/uts/intel/io/bscbus.conf | 31 | ||||
| -rw-r--r-- | usr/src/uts/intel/io/bscv.conf | 38 |
2 files changed, 0 insertions, 69 deletions
diff --git a/usr/src/uts/intel/io/bscbus.conf b/usr/src/uts/intel/io/bscbus.conf deleted file mode 100644 index c783e2619d..0000000000 --- a/usr/src/uts/intel/io/bscbus.conf +++ /dev/null @@ -1,31 +0,0 @@ -# -# 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 2003 Sun Microsystems, Inc. -# All rights reserved. -# Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" -# -# Configuration file for "bscbus" driver -# - -interrupt-priorities = 8, 8; diff --git a/usr/src/uts/intel/io/bscv.conf b/usr/src/uts/intel/io/bscv.conf deleted file mode 100644 index 20f96109e4..0000000000 --- a/usr/src/uts/intel/io/bscv.conf +++ /dev/null @@ -1,38 +0,0 @@ -# -# 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 2003 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# -# Configuration file for bscv driver -# - -ddi-forceattach=1; - -# -# The DEBUG version of the bscv driver supports a debug option value. -# -debug=0x0; - -parent="bscbus" name="bscv" instance=0; -reg=0x0, 0x0, 0x4000, 0x201, 0x0, 0x1; |