summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2018-02-12 14:27:34 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2018-02-12 14:27:34 +0000
commit033f97949ff35a0838d6a6039002e1d6befbf085 (patch)
tree38c892ecd8ddd0e1c6943843ef140d3e7cf0c65f /usr/src
parentda3db7fe6cbf6459503413370c2cebf33d72abb0 (diff)
downloadillumos-joyent-033f97949ff35a0838d6a6039002e1d6befbf085.tar.gz
8872 e1000g MAC_CAPAB_LED support [fix mismerge]
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/common/sys/mac_provider.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/usr/src/uts/common/sys/mac_provider.h b/usr/src/uts/common/sys/mac_provider.h
index 26f01ddb90..1c6ed9e6fc 100644
--- a/usr/src/uts/common/sys/mac_provider.h
+++ b/usr/src/uts/common/sys/mac_provider.h
@@ -110,8 +110,6 @@ typedef enum {
MAC_CAPAB_VRRP = 0x00400000, /* data is mac_capab_vrrp_t */
MAC_CAPAB_OVERLAY = 0x00800000, /* boolean only, no data */
MAC_CAPAB_TRANSCEIVER = 0x01000000, /* mac_capab_transciever_t */
- MAC_CAPAB_LED = 0x02000000, /* data is mac_capab_led_t */
- MAC_CAPAB_TRANSCEIVER = 0x01000000, /* mac_capab_transciever_t */
MAC_CAPAB_LED = 0x02000000 /* data is mac_capab_led_t */
} mac_capab_t;