From 0da629d403910eaf85c0f5693fadf226aa5da7be Mon Sep 17 00:00:00 2001
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Tue, 4 Feb 2014 09:11:50 +0000
Subject: [PATCH] Regenerate usb.conf

MFC after:	2 days
---
 etc/devd/usb.conf | 54 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/etc/devd/usb.conf b/etc/devd/usb.conf
index 5d739110597..45100e0a654 100644
--- a/etc/devd/usb.conf
+++ b/etc/devd/usb.conf
@@ -1097,7 +1097,39 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05ac";
-	match "product" "(0x020d|0x020e|0x020f|0x0215|0x0217|0x0218|0x0219|0x021a|0x021b|0x021c|0x0229|0x022a|0x022b|0x030a|0x030b)";
+	match "product" "(0x020d|0x020e|0x020f|0x0215|0x0217|0x0218|0x0219|0x021a|0x021b|0x021c)";
+	action "kldload -n atp";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x05ac";
+	match "product" "(0x0223|0x0224|0x0225)";
+	action "kldload -n wsp";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x05ac";
+	match "product" "(0x0229|0x022a|0x022b)";
+	action "kldload -n atp";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x05ac";
+	match "product" "(0x0230|0x0231|0x0232|0x0236|0x0237|0x0238|0x023f|0x0240|0x0241|0x0242|0x0243|0x0244|0x0245|0x0246|0x0247|0x0249|0x024a|0x024b|0x024c|0x024d|0x024e|0x0252|0x0253|0x0254|0x0259|0x025a|0x025b|0x0262|0x0263|0x0264|0x0290|0x0291|0x0292)";
+	action "kldload -n wsp";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x05ac";
+	match "product" "(0x030a|0x030b)";
 	action "kldload -n atp";
 };
 
@@ -2209,23 +2241,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0af0";
-	match "product" "0x7601";
-	action "kldload -n uhso";
-};
-
-nomatch 32 {
-	match "bus" "uhub[0-9]+";
-	match "mode" "host";
-	match "vendor" "0x0af0";
-	match "product" "0x9000";
-	action "kldload -n u3g";
-};
-
-nomatch 32 {
-	match "bus" "uhub[0-9]+";
-	match "mode" "host";
-	match "vendor" "0x0af0";
-	match "product" "(0xc031|0xd013|0xd031)";
+	match "product" "(0x7601|0x9000|0xc031|0xd013|0xd031)";
 	action "kldload -n uhso";
 };
 
@@ -5365,5 +5381,5 @@ nomatch 32 {
 	action "kldload -n umass";
 };
 
-# 2583 USB entries processed
+# 2619 USB entries processed