diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-10-03 17:29:03 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-10-03 17:29:03 +0000 |
| commit | d67ae5704b2979fb68ecb325e1f03ad1b2a49741 (patch) | |
| tree | 076596f0c1b901eddfa80ee4c06d3f2f22736c1e /usr/src/uts/intel/Makefile.intel | |
| parent | 52d527e53cc50b1c00010d4215ed2a0341501cac (diff) | |
| parent | 50c4511157ef5d522f0c717eef41fe9ddb58f171 (diff) | |
| download | illumos-joyent-d67ae5704b2979fb68ecb325e1f03ad1b2a49741.tar.gz | |
[illumos-gate merge]
commit 50c4511157ef5d522f0c717eef41fe9ddb58f171
5015 improvements to mpt_sas debug logging and mdb module
commit f52228b83292315dabb975359cdcf9db662845b2
4037 sTec S112x support
Conflicts:
usr/src/uts/common/Makefile.rules (copyright)
usr/src/uts/common/Makefile.files (copyright)
Manifests:
usr/src/pkg/manifests/driver-storage-skd.mf
Diffstat (limited to 'usr/src/uts/intel/Makefile.intel')
| -rw-r--r-- | usr/src/uts/intel/Makefile.intel | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/uts/intel/Makefile.intel b/usr/src/uts/intel/Makefile.intel index e534120477..b6d895a40c 100644 --- a/usr/src/uts/intel/Makefile.intel +++ b/usr/src/uts/intel/Makefile.intel @@ -19,7 +19,7 @@ # # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. -# Copyright (c) 2012 Nexenta Systems, Inc. All rights reserved. +# Copyright (c) 2014 Nexenta Systems, Inc. All rights reserved. # Copyright (c) 2013 Andrew Stormont. All rights reserved. # Copyright (c) 2014, Joyent, Inc. All rights reserved. @@ -327,6 +327,7 @@ DRV_KMODS += sdhost DRV_KMODS += sgen DRV_KMODS += si3124 DRV_KMODS += smbios +DRV_KMODS += skd DRV_KMODS += softmac DRV_KMODS += spdsock DRV_KMODS += smbsrv |