diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-07-27 22:20:28 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-07-27 22:20:28 +0000 |
| commit | 5f78ec1c9f70cd1e2e348d374a4c6aabfde7795b (patch) | |
| tree | 38628b1289f1c465af2ce50de529a269a17e51af /etc | |
| parent | 8d0f10857a48c0f5e04bf0cbe3d7443cb4f8051a (diff) | |
| parent | 7d477dc35a25405bcc41870a66845ae1aa7d72f3 (diff) | |
| download | src-5f78ec1c9f70cd1e2e348d374a4c6aabfde7795b.tar.gz src-5f78ec1c9f70cd1e2e348d374a4c6aabfde7795b.zip | |
Merge ^/head r285793 through r285923.
Notes
Notes:
svn path=/projects/clang-trunk/; revision=285924
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 3c3cd345a046..4f1d92f80695 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 a8634362286b..d16bb4759f1f 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -528,6 +528,8 @@ .. gzip .. + ident + .. join .. jot |