diff options
| author | dim <dim@FreeBSD.org> | 2015-07-27 22:20:28 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-07-27 22:20:28 +0000 |
| commit | c38a9a5a203cb54a446daa5e091ad122cf0009c3 (patch) | |
| tree | 38628b1289f1c465af2ce50de529a269a17e51af /etc | |
| parent | 56628666d99043fba09f14aabe048c4d94871068 (diff) | |
| parent | b19c7b1b4ddcd5c14c11d614f57487a5debe832c (diff) | |
| download | FreeBSD-src-c38a9a5a203cb54a446daa5e091ad122cf0009c3.zip FreeBSD-src-c38a9a5a203cb54a446daa5e091ad122cf0009c3.tar.gz | |
Merge ^/head r285793 through r285923.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/devd/usb.conf | 11 | ||||
| -rw-r--r-- | etc/mtree/BSD.tests.dist | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/etc/devd/usb.conf b/etc/devd/usb.conf index 3c3cd34..4f1d92f 100644 --- a/etc/devd/usb.conf +++ b/etc/devd/usb.conf @@ -5436,6 +5436,15 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "intclass" "0x02"; + match "intsubclass" "0x02"; + match "intprotocol" "0xff"; + action "kldload -n if_urndis"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "intclass" "0x03"; match "intsubclass" "0x01"; match "intprotocol" "0x01"; @@ -5576,5 +5585,5 @@ nomatch 32 { action "kldload -n umass"; }; -# 2687 USB entries processed +# 2688 USB entries processed diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index a863436..d16bb47 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -528,6 +528,8 @@ .. gzip .. + ident + .. join .. jot |
