[Glibc-bsd-commits] r3541 - in trunk/freebsd-utils/debian: . local/devd

[Robert Millan]

Author: rmh
Date: 2011-07-06 18:37:25 +0000 (Wed, 06 Jul 2011)
New Revision: 3541

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/local/devd/usb.conf
Log:
Fix a few syntax errors in usb.conf.

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2011-07-06 18:10:56 UTC (rev 3540)
+++ trunk/freebsd-utils/debian/changelog	2011-07-06 18:37:25 UTC (rev 3541)
@@ -7,8 +7,9 @@
   * Move usb.conf and pci.conf devd files into debian/local/ (upstream
     is taking a different route and will replace these files when
     they're able to autogenerate them).
+  * Fix a few syntax errors in usb.conf.
 
- -- Robert Millan <rmh at debian.org>  Wed, 06 Jul 2011 20:10:42 +0200
+ -- Robert Millan <rmh at debian.org>  Wed, 06 Jul 2011 20:36:40 +0200
 
 freebsd-utils (8.2+ds1-2) unstable; urgency=low
 

Modified: trunk/freebsd-utils/debian/local/devd/usb.conf
===================================================================
--- trunk/freebsd-utils/debian/local/devd/usb.conf	2011-07-06 18:10:56 UTC (rev 3540)
+++ trunk/freebsd-utils/debian/local/devd/usb.conf	2011-07-06 18:37:25 UTC (rev 3541)
@@ -559,19 +559,33 @@
 nomatch 10 {
 	match "bus" "uhub[0-9]+";
 	match "vendor" "0x0b05";
-	match "product" "(0x1723|$USB_PRODUCT_ASUS_RT2573_2$USB_PRODUCT_BELKIN 0x705a|0x905b)";
+	match "product" "(0x1723|0x1724)";
 	action "kldload if_rum";
 };
 
 nomatch 10 {
 	match "bus" "uhub[0-9]+";
+	match "vendor" "0x050d";
+	match "product" "(0x705a|0x905b)";
+	action "kldload if_rum";
+};
+
+nomatch 10 {
+	match "bus" "uhub[0-9]+";
 	match "vendor" "0x13b1";
-	match "product" "(0x0020|$USB_PRODUCT_CISCOLINKSYS_WUSB54GR$USB_PRODUCT_CONCEPTRONIC2 0x3c22)";
+	match "product" "(0x0020|0x0023)";
 	action "kldload if_rum";
 };
 
 nomatch 10 {
 	match "bus" "uhub[0-9]+";
+	match "vendor" "0x14b2";
+	match "product" "0x3c22";
+	action "kldload if_rum";
+};
+
+nomatch 10 {
+	match "bus" "uhub[0-9]+";
 	match "vendor" "0x07aa";
 	match "product" "(0x002d|0x002e)";
 	action "kldload if_rum";
@@ -2575,7 +2589,7 @@
 nomatch 10 {
 	match "bus" "uhub[0-9]+";
 	match "vendor" "0x0489";
-	match "product" "(0xe003|$USB_PRODUCT_FOXCONN 0xe000)";
+	match "product" "(0xe003|0xe000)";
 	action "kldload uslcom";
 };
 
@@ -2596,7 +2610,7 @@
 nomatch 10 {
 	match "bus" "uhub[0-9]+";
 	match "vendor" "0x0bed";
-	match "product" "(0x1100|$USB_PRODUCT_MEI 0x1101)";
+	match "product" "(0x1100|0x1101)";
 	action "kldload uslcom";
 };
 
@@ -2757,7 +2771,7 @@
 nomatch 10 {
 	match "bus" "uhub[0-9]+";
 	match "vendor" "0x054c";
-	match "product" "(0x0066|0x009a|0x0095|0x00da|0x0038|$USB_PRODUCT_SONY_CLIE_25|0x0169|0x0144)";
+	match "product" "(0x0066|0x009a|0x0095|0x00da|0x0038|0x0169|0x0144)";
 	action "kldload uvisor";
 };