Switch over to usbdevs.h generated at compile time.

44 files changed, 44 insertions, 43 deletions

diff --git a/sys/modules/usb2/bluetooth_fw/Makefile b/sys/modules/usb2/bluetooth_fw/Makefile
index 8b24300..341c1e9 100644
--- a/sys/modules/usb2/bluetooth_fw/Makefile
+++ b/sys/modules/usb2/bluetooth_fw/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_bluetooth_fw
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_netgraph.h
+SRCS+= opt_usb.h opt_bus.h opt_netgraph.h usbdevs.h
 SRCS+= ubtbcmfw2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/bluetooth_ng/Makefile b/sys/modules/usb2/bluetooth_ng/Makefile
index d40f9fc..add9eaa 100644
--- a/sys/modules/usb2/bluetooth_ng/Makefile
+++ b/sys/modules/usb2/bluetooth_ng/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_bluetooth_ng
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_netgraph.h
+SRCS+= opt_usb.h opt_bus.h opt_netgraph.h usbdevs.h
 SRCS+= ng_ubt2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/core/Makefile b/sys/modules/usb2/core/Makefile
index 5f0b187..9ebcb2b 100644
--- a/sys/modules/usb2/core/Makefile
+++ b/sys/modules/usb2/core/Makefile
@@ -32,6 +32,7 @@ S=     ${.CURDIR}/../../..
 KMOD=  usb2_core
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h opt_usb.h opt_bus.h
+SRCS+= usbdevs.h usbdevs_data.h
 SRCS+= usb2_if.c
 SRCS+= usb2_busdma.c
 SRCS+= usb2_compat_linux.c
diff --git a/sys/modules/usb2/ethernet_aue/Makefile b/sys/modules/usb2/ethernet_aue/Makefile
index c328055..0d94c5c 100644
--- a/sys/modules/usb2/ethernet_aue/Makefile
+++ b/sys/modules/usb2/ethernet_aue/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_ethernet_aue
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_aue2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/ethernet_axe/Makefile b/sys/modules/usb2/ethernet_axe/Makefile
index 9659012..e78297b 100644
--- a/sys/modules/usb2/ethernet_axe/Makefile
+++ b/sys/modules/usb2/ethernet_axe/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_ethernet_axe
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_axe2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/ethernet_cdce/Makefile b/sys/modules/usb2/ethernet_cdce/Makefile
index 329e1a6..6ac0ce2 100644
--- a/sys/modules/usb2/ethernet_cdce/Makefile
+++ b/sys/modules/usb2/ethernet_cdce/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_ethernet_cdce
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_cdce2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/ethernet_cue/Makefile b/sys/modules/usb2/ethernet_cue/Makefile
index 96af01b..4e56f62 100644
--- a/sys/modules/usb2/ethernet_cue/Makefile
+++ b/sys/modules/usb2/ethernet_cue/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_ethernet_cue
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_cue2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/ethernet_dav/Makefile b/sys/modules/usb2/ethernet_dav/Makefile
index 0fd9468..4cc5439 100644
--- a/sys/modules/usb2/ethernet_dav/Makefile
+++ b/sys/modules/usb2/ethernet_dav/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_ethernet_dav
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_udav2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/ethernet_kue/Makefile b/sys/modules/usb2/ethernet_kue/Makefile
index 28e2531..ab8c413 100644
--- a/sys/modules/usb2/ethernet_kue/Makefile
+++ b/sys/modules/usb2/ethernet_kue/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_ethernet_kue
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_kue2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/ethernet_rue/Makefile b/sys/modules/usb2/ethernet_rue/Makefile
index dcbd202..788eeab 100644
--- a/sys/modules/usb2/ethernet_rue/Makefile
+++ b/sys/modules/usb2/ethernet_rue/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_ethernet_rue
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_rue2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/input_hid/Makefile b/sys/modules/usb2/input_hid/Makefile
index 27f5c5a..1684a4b 100644
--- a/sys/modules/usb2/input_hid/Makefile
+++ b/sys/modules/usb2/input_hid/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_input_hid
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h opt_kbd.h opt_ukbd.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h opt_kbd.h opt_ukbd.h usbdevs.h
 SRCS+= uhid2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/input_kbd/Makefile b/sys/modules/usb2/input_kbd/Makefile
index 23ec6d8..7d91bb4 100644
--- a/sys/modules/usb2/input_kbd/Makefile
+++ b/sys/modules/usb2/input_kbd/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_input_kbd
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h opt_kbd.h opt_ukbd.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h opt_kbd.h opt_ukbd.h usbdevs.h
 SRCS+= ukbd2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/input_ms/Makefile b/sys/modules/usb2/input_ms/Makefile
index a3ff3e9..1189595 100644
--- a/sys/modules/usb2/input_ms/Makefile
+++ b/sys/modules/usb2/input_ms/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_input_ms
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h opt_kbd.h opt_ukbd.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h opt_kbd.h opt_ukbd.h usbdevs.h
 SRCS+= ums2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/misc_dbp/Makefile b/sys/modules/usb2/misc_dbp/Makefile
index 44a0681..f6f5497 100644
--- a/sys/modules/usb2/misc_dbp/Makefile
+++ b/sys/modules/usb2/misc_dbp/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_misc_dbp
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_netgraph.h
+SRCS+= opt_usb.h opt_bus.h opt_netgraph.h usbdevs.h
 SRCS+= udbp2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/misc_fm/Makefile b/sys/modules/usb2/misc_fm/Makefile
index f5e377d..f3fb6c7 100644
--- a/sys/modules/usb2/misc_fm/Makefile
+++ b/sys/modules/usb2/misc_fm/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_misc_fm
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_netgraph.h
+SRCS+= opt_usb.h opt_bus.h opt_netgraph.h usbdevs.h
 SRCS+= ufm2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/quirk/Makefile b/sys/modules/usb2/quirk/Makefile
index aae5dda..e48581e 100644
--- a/sys/modules/usb2/quirk/Makefile
+++ b/sys/modules/usb2/quirk/Makefile
@@ -31,7 +31,7 @@ S=     ${.CURDIR}/../../..
 
 KMOD=  usb2_quirk
 SRCS= 
-SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h opt_usb.h opt_bus.h
+SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h opt_usb.h opt_bus.h usbdevs.h
 SRCS+= usb2_quirk.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/scanner/Makefile b/sys/modules/usb2/scanner/Makefile
index db82e48..4d0583f 100644
--- a/sys/modules/usb2/scanner/Makefile
+++ b/sys/modules/usb2/scanner/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_scanner
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h 
+SRCS+= opt_usb.h opt_bus.h  usbdevs.h
 SRCS+= uscanner2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/serial_3g/Makefile b/sys/modules/usb2/serial_3g/Makefile
index 1361083..40f4fa6 100644
--- a/sys/modules/usb2/serial_3g/Makefile
+++ b/sys/modules/usb2/serial_3g/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_3g
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= u3g2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/serial_ark/Makefile b/sys/modules/usb2/serial_ark/Makefile
index e0919c4..a08b027 100644
--- a/sys/modules/usb2/serial_ark/Makefile
+++ b/sys/modules/usb2/serial_ark/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_ark
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= uark2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/serial_bsa/Makefile b/sys/modules/usb2/serial_bsa/Makefile
index 782bef1..3fe72d7 100644
--- a/sys/modules/usb2/serial_bsa/Makefile
+++ b/sys/modules/usb2/serial_bsa/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_bsa
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= ubsa2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/serial_bser/Makefile b/sys/modules/usb2/serial_bser/Makefile
index 7b2921c..72bd9fc 100644
--- a/sys/modules/usb2/serial_bser/Makefile
+++ b/sys/modules/usb2/serial_bser/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_bser
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= ubser2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/serial_chcom/Makefile b/sys/modules/usb2/serial_chcom/Makefile
index 726f711..a6c3c09 100644
--- a/sys/modules/usb2/serial_chcom/Makefile
+++ b/sys/modules/usb2/serial_chcom/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_chcom
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= uchcom2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/serial_cycom/Makefile b/sys/modules/usb2/serial_cycom/Makefile
index 74a1865..a274d71 100644
--- a/sys/modules/usb2/serial_cycom/Makefile
+++ b/sys/modules/usb2/serial_cycom/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_cycom
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= ucycom2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/serial_foma/Makefile b/sys/modules/usb2/serial_foma/Makefile
index 520abee..bf808a5 100644
--- a/sys/modules/usb2/serial_foma/Makefile
+++ b/sys/modules/usb2/serial_foma/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_foma
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= ufoma2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/serial_ftdi/Makefile b/sys/modules/usb2/serial_ftdi/Makefile
index c6735e3..1523264 100644
--- a/sys/modules/usb2/serial_ftdi/Makefile
+++ b/sys/modules/usb2/serial_ftdi/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_ftdi
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= uftdi2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/serial_gensa/Makefile b/sys/modules/usb2/serial_gensa/Makefile
index 6511d86..1c6a6db 100644
--- a/sys/modules/usb2/serial_gensa/Makefile
+++ b/sys/modules/usb2/serial_gensa/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_gensa
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= ugensa2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/serial_ipaq/Makefile b/sys/modules/usb2/serial_ipaq/Makefile
index 159eb72..1086ba1 100644
--- a/sys/modules/usb2/serial_ipaq/Makefile
+++ b/sys/modules/usb2/serial_ipaq/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_ipaq
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= uipaq2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/serial_lpt/Makefile b/sys/modules/usb2/serial_lpt/Makefile
index 2135e9f..b9aa1bb 100644
--- a/sys/modules/usb2/serial_lpt/Makefile
+++ b/sys/modules/usb2/serial_lpt/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_lpt
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= ulpt2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/serial_mct/Makefile b/sys/modules/usb2/serial_mct/Makefile
index 76b2f3e..0436635 100644
--- a/sys/modules/usb2/serial_mct/Makefile
+++ b/sys/modules/usb2/serial_mct/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_mct
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= umct2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/serial_modem/Makefile b/sys/modules/usb2/serial_modem/Makefile
index f1fbf45..7f7e2e2 100644
--- a/sys/modules/usb2/serial_modem/Makefile
+++ b/sys/modules/usb2/serial_modem/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_modem
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= umodem2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/serial_moscom/Makefile b/sys/modules/usb2/serial_moscom/Makefile
index 46bf537..822df85 100644
--- a/sys/modules/usb2/serial_moscom/Makefile
+++ b/sys/modules/usb2/serial_moscom/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_moscom
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= umoscom2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/serial_plcom/Makefile b/sys/modules/usb2/serial_plcom/Makefile
index 5f4353a..1d41d9c 100644
--- a/sys/modules/usb2/serial_plcom/Makefile
+++ b/sys/modules/usb2/serial_plcom/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_plcom
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= uplcom2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/serial_slcom/Makefile b/sys/modules/usb2/serial_slcom/Makefile
index a32d299..9ec2195 100644
--- a/sys/modules/usb2/serial_slcom/Makefile
+++ b/sys/modules/usb2/serial_slcom/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_slcom
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= uslcom2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/serial_visor/Makefile b/sys/modules/usb2/serial_visor/Makefile
index cbda332..90d08bf 100644
--- a/sys/modules/usb2/serial_visor/Makefile
+++ b/sys/modules/usb2/serial_visor/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_visor
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= uvisor2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/serial_vscom/Makefile b/sys/modules/usb2/serial_vscom/Makefile
index 8c4114a..bba4d0c 100644
--- a/sys/modules/usb2/serial_vscom/Makefile
+++ b/sys/modules/usb2/serial_vscom/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_serial_vscom
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_compat.h
+SRCS+= opt_usb.h opt_bus.h opt_compat.h usbdevs.h
 SRCS+= uvscom2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/sound/Makefile b/sys/modules/usb2/sound/Makefile
index 0f1bbb9..d12f028 100644
--- a/sys/modules/usb2/sound/Makefile
+++ b/sys/modules/usb2/sound/Makefile
@@ -32,7 +32,7 @@ S=     ${.CURDIR}/../../..
 KMOD=  usb2_sound
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h feeder_if.h channel_if.h
+SRCS+= opt_usb.h opt_bus.h feeder_if.h channel_if.h usbdevs.h
 SRCS+= mixer_if.h
 
 SRCS+= usb2_sound.c
diff --git a/sys/modules/usb2/storage_ata/Makefile b/sys/modules/usb2/storage_ata/Makefile
index c4d7b59..c49a0bc 100644
--- a/sys/modules/usb2/storage_ata/Makefile
+++ b/sys/modules/usb2/storage_ata/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_storage_ata
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h
+SRCS+= opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h usbdevs.h
 SRCS+= ata-usb2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/storage_fs/Makefile b/sys/modules/usb2/storage_fs/Makefile
index 3392862..b06d9a3 100644
--- a/sys/modules/usb2/storage_fs/Makefile
+++ b/sys/modules/usb2/storage_fs/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_storage_fs
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h
+SRCS+= opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h usbdevs.h
 SRCS+= ustorage2_fs.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/storage_mass/Makefile b/sys/modules/usb2/storage_mass/Makefile
index 6ab6613..4758973 100644
--- a/sys/modules/usb2/storage_mass/Makefile
+++ b/sys/modules/usb2/storage_mass/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_storage_mass
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h
+SRCS+= opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h usbdevs.h
 SRCS+= umass2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/storage_rio/Makefile b/sys/modules/usb2/storage_rio/Makefile
index 74a1e9e..92cb494 100644
--- a/sys/modules/usb2/storage_rio/Makefile
+++ b/sys/modules/usb2/storage_rio/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_storage_rio
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h
+SRCS+= opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h usbdevs.h
 SRCS+= urio2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/template/Makefile b/sys/modules/usb2/template/Makefile
index 64c8054..ab4eb1d 100644
--- a/sys/modules/usb2/template/Makefile
+++ b/sys/modules/usb2/template/Makefile
@@ -31,7 +31,7 @@ S=     ${.CURDIR}/../../..
 
 KMOD=  usb2_template
 SRCS= 
-SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h opt_usb.h opt_bus.h
+SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h opt_usb.h opt_bus.h usbdevs.h
 SRCS+= usb2_template.c
 SRCS+= usb2_template_cdce.c
 SRCS+= usb2_template_msc.c
diff --git a/sys/modules/usb2/wlan_ral/Makefile b/sys/modules/usb2/wlan_ral/Makefile
index bf653e8..23e3dfd 100644
--- a/sys/modules/usb2/wlan_ral/Makefile
+++ b/sys/modules/usb2/wlan_ral/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_wlan_ral
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_ural2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/wlan_rum/Makefile b/sys/modules/usb2/wlan_rum/Makefile
index 0eed54b..6477d03 100644
--- a/sys/modules/usb2/wlan_rum/Makefile
+++ b/sys/modules/usb2/wlan_rum/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_wlan_rum
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_rum2.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb2/wlan_zyd/Makefile b/sys/modules/usb2/wlan_zyd/Makefile
index 0a231ea..ac2d27b 100644
--- a/sys/modules/usb2/wlan_zyd/Makefile
+++ b/sys/modules/usb2/wlan_zyd/Makefile
@@ -32,7 +32,7 @@ S=${.CURDIR}/../../..
 KMOD=usb2_wlan_zyd
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
-SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
+SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h usbdevs.h
 SRCS+= if_zyd2.c
 
 .include <bsd.kmod.mk>