diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-05-25 11:01:53 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-05-25 11:01:53 +0000 |
| commit | 6ce72fef7b861e531988470f43ad393d389d85fd (patch) | |
| tree | adeb67485e05f653d990fe5852e233e74757ccc3 /usr/src/cmd/Makefile | |
| parent | adfeb11ce94f7c9b78db3f67388fb704c2d8673a (diff) | |
| parent | 1cdca625ac0e1e0a31db02a0dc4be33ae14b64cc (diff) | |
| download | illumos-joyent-6ce72fef7b861e531988470f43ad393d389d85fd.tar.gz | |
[illumos-gate merge]
commit 1cdca625ac0e1e0a31db02a0dc4be33ae14b64cc
9534 xhci_portsc should only be installed on x86
commit fcd69270d3e30d8121da73f26d9d8aec4375ecd4
9550 Create hub symlinks for xhci devices
commit 0df48811699b83d09c552548effcb1718d6ff1d0
9545 Global visibility of C11 functions in C++11 and C++17 in stdlib.h
Conflicts:
usr/src/uts/common/sys/smbios_impl.h
usr/src/common/smbios/smb_info.c
usr/src/common/smbios/mktables.sh
Diffstat (limited to 'usr/src/cmd/Makefile')
| -rw-r--r-- | usr/src/cmd/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/cmd/Makefile b/usr/src/cmd/Makefile index ea615f12c1..5bc1979193 100644 --- a/usr/src/cmd/Makefile +++ b/usr/src/cmd/Makefile @@ -27,6 +27,7 @@ # Copyright 2014 Garrett D'Amore <garrett@damore.org> # Copyright 2016 Toomas Soome <tsoome@me.com> # Copyright 2016 Nexenta Systems, Inc. +# Copyright 2018 Gary Mills # include ../Makefile.master @@ -457,7 +458,6 @@ COMMON_SUBDIRS= \ wracct \ write \ xargs \ - xhci \ xstr \ yes \ ypcmd \ @@ -490,6 +490,7 @@ i386_SUBDIRS= \ nvmeadm \ rtc \ ucodeadm \ + xhci \ xvm sparc_SUBDIRS= \ |