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/Makefile.intel | |
| 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/Makefile.intel')
| -rw-r--r-- | usr/src/uts/intel/Makefile.intel | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/usr/src/uts/intel/Makefile.intel b/usr/src/uts/intel/Makefile.intel index 52f24dd802..820e0a4e31 100644 --- a/usr/src/uts/intel/Makefile.intel +++ b/usr/src/uts/intel/Makefile.intel @@ -26,6 +26,7 @@ # Copyright 2016 Garrett D'Amore <garrett@damore.org> # Copyright 2018 Nexenta Systems, Inc. # Copyright 2019 RackTop Systems +# Copyright 2019 Peter Tribble. # # @@ -255,8 +256,6 @@ DRV_KMODS += bge DRV_KMODS += bofi DRV_KMODS += bpf DRV_KMODS += bridge -DRV_KMODS += bscbus -DRV_KMODS += bscv DRV_KMODS += chxge DRV_KMODS += cxgbe DRV_KMODS += ntxn |