diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-05-28 11:49:17 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-05-28 11:49:17 +0000 |
| commit | 69833aafa8de6b8142d53d1a6f43e799e39fec21 (patch) | |
| tree | 39ce1d08822e6f7785d10f5a0b3b5f27849150ee /usr/src/lib/libc | |
| parent | ab6a47af7ee9daefa937f7e8ca0531e68d003686 (diff) | |
| parent | 1f4c6dbc37f14382f7ff4575a74da056dbd34d66 (diff) | |
| download | illumos-joyent-69833aafa8de6b8142d53d1a6f43e799e39fec21.tar.gz | |
[illumos-gate merge]
commit 1f4c6dbc37f14382f7ff4575a74da056dbd34d66
10864 Remove starcat support
commit 7811b028df2f34164be65174d666b570b73d32c3
11066 zfs clean_mirror tests should scrub between tests
commit f006f886619b16083d53ffdfa28948267e57cccf
10502 zfs_mount_006_pos.ksh wanders outside the test area
Conflicts:
usr/src/man/man1m/Makefile
Diffstat (limited to 'usr/src/lib/libc')
| -rw-r--r-- | usr/src/lib/libc/capabilities/sun4u-us3/common/mapfile-cap | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/usr/src/lib/libc/capabilities/sun4u-us3/common/mapfile-cap b/usr/src/lib/libc/capabilities/sun4u-us3/common/mapfile-cap index 987347dd94..789f4c8814 100644 --- a/usr/src/lib/libc/capabilities/sun4u-us3/common/mapfile-cap +++ b/usr/src/lib/libc/capabilities/sun4u-us3/common/mapfile-cap @@ -34,7 +34,6 @@ CAPABILITY { PLATFORM += "SUNW,Sun-Blade-1000"; PLATFORM += "SUNW,Sun-Blade-1500"; PLATFORM += "SUNW,Sun-Blade-2500"; - PLATFORM += "SUNW,Sun-Fire-15000"; PLATFORM += "SUNW,Sun-Fire-280R"; PLATFORM += "SUNW,Sun-Fire-480R"; PLATFORM += "SUNW,Sun-Fire-880"; |