Bring in http://perforce.freebsd.org/chv.cgi?CH=152584 from hps.

Submitted by:	hps

16 files changed, 1 insertions, 17 deletions

diff --git a/sys/dev/usb2/serial/uark2.c b/sys/dev/usb2/serial/uark2.c
index 5503140..b0df284 100644
--- a/sys/dev/usb2/serial/uark2.c
+++ b/sys/dev/usb2/serial/uark2.c
@@ -174,7 +174,6 @@ static driver_t uark_driver = {
 DRIVER_MODULE(uark, ushub, uark_driver, uark_devclass, NULL, 0);
 MODULE_DEPEND(uark, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uark, usb2_core, 1, 1, 1);
-MODULE_DEPEND(uark, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static const struct usb2_device_id uark_devs[] = {
 	{USB_VPI(USB_VENDOR_ARKMICRO, USB_PRODUCT_ARKMICRO_ARK3116, 0)},
diff --git a/sys/dev/usb2/serial/ubsa2.c b/sys/dev/usb2/serial/ubsa2.c
index 140e090..68fd882 100644
--- a/sys/dev/usb2/serial/ubsa2.c
+++ b/sys/dev/usb2/serial/ubsa2.c
@@ -313,7 +313,6 @@ static driver_t ubsa_driver = {
 DRIVER_MODULE(ubsa, ushub, ubsa_driver, ubsa_devclass, NULL, 0);
 MODULE_DEPEND(ubsa, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(ubsa, usb2_core, 1, 1, 1);
-MODULE_DEPEND(ubsa, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static int
 ubsa_probe(device_t dev)
diff --git a/sys/dev/usb2/serial/ubser2.c b/sys/dev/usb2/serial/ubser2.c
index 7b9c88d..4a5e796 100644
--- a/sys/dev/usb2/serial/ubser2.c
+++ b/sys/dev/usb2/serial/ubser2.c
@@ -227,7 +227,6 @@ static driver_t ubser_driver = {
 DRIVER_MODULE(ubser, ushub, ubser_driver, ubser_devclass, NULL, 0);
 MODULE_DEPEND(ubser, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(ubser, usb2_core, 1, 1, 1);
-MODULE_DEPEND(ubser, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static int
 ubser_probe(device_t dev)
diff --git a/sys/dev/usb2/serial/uchcom2.c b/sys/dev/usb2/serial/uchcom2.c
index 049c924..42469d1 100644
--- a/sys/dev/usb2/serial/uchcom2.c
+++ b/sys/dev/usb2/serial/uchcom2.c
@@ -1035,4 +1035,3 @@ static devclass_t uchcom_devclass;
 DRIVER_MODULE(uchcom, ushub, uchcom_driver, uchcom_devclass, NULL, 0);
 MODULE_DEPEND(uchcom, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uchcom, usb2_core, 1, 1, 1);
-MODULE_DEPEND(uchcom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
diff --git a/sys/dev/usb2/serial/ucycom2.c b/sys/dev/usb2/serial/ucycom2.c
index 2cbbe47..510d05a 100644
--- a/sys/dev/usb2/serial/ucycom2.c
+++ b/sys/dev/usb2/serial/ucycom2.c
@@ -173,7 +173,6 @@ static driver_t ucycom_driver = {
 DRIVER_MODULE(ucycom, ushub, ucycom_driver, ucycom_devclass, NULL, 0);
 MODULE_DEPEND(ucycom, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(ucycom, usb2_core, 1, 1, 1);
-MODULE_DEPEND(ucycom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 /*
  * Supported devices
diff --git a/sys/dev/usb2/serial/ufoma2.c b/sys/dev/usb2/serial/ufoma2.c
index 5c04d0c..f5bdc27 100644
--- a/sys/dev/usb2/serial/ufoma2.c
+++ b/sys/dev/usb2/serial/ufoma2.c
@@ -335,7 +335,6 @@ static driver_t ufoma_driver = {
 DRIVER_MODULE(ufoma, ushub, ufoma_driver, ufoma_devclass, NULL, 0);
 MODULE_DEPEND(ufoma, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(ufoma, usb2_core, 1, 1, 1);
-MODULE_DEPEND(ufoma, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static int
 ufoma_probe(device_t dev)
diff --git a/sys/dev/usb2/serial/uftdi2.c b/sys/dev/usb2/serial/uftdi2.c
index d620441..c8be712 100644
--- a/sys/dev/usb2/serial/uftdi2.c
+++ b/sys/dev/usb2/serial/uftdi2.c
@@ -222,7 +222,6 @@ static driver_t uftdi_driver = {
 DRIVER_MODULE(uftdi, ushub, uftdi_driver, uftdi_devclass, NULL, 0);
 MODULE_DEPEND(uftdi, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uftdi, usb2_core, 1, 1, 1);
-MODULE_DEPEND(uftdi, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static struct usb2_device_id uftdi_devs[] = {
 	{USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U100AX, UFTDI_TYPE_SIO)},
diff --git a/sys/dev/usb2/serial/ugensa2.c b/sys/dev/usb2/serial/ugensa2.c
index e3ae419..ccbd8a9 100644
--- a/sys/dev/usb2/serial/ugensa2.c
+++ b/sys/dev/usb2/serial/ugensa2.c
@@ -172,7 +172,6 @@ static driver_t ugensa_driver = {
 DRIVER_MODULE(ugensa, ushub, ugensa_driver, ugensa_devclass, NULL, 0);
 MODULE_DEPEND(ugensa, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(ugensa, usb2_core, 1, 1, 1);
-MODULE_DEPEND(ugensa, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static const struct usb2_device_id ugensa_devs[] = {
 	{USB_VPI(USB_VENDOR_AIRPRIME, USB_PRODUCT_AIRPRIME_PC5220, 0)},
diff --git a/sys/dev/usb2/serial/uipaq2.c b/sys/dev/usb2/serial/uipaq2.c
index 91503d8..6b1aa29 100644
--- a/sys/dev/usb2/serial/uipaq2.c
+++ b/sys/dev/usb2/serial/uipaq2.c
@@ -1094,7 +1094,6 @@ static driver_t uipaq_driver = {
 DRIVER_MODULE(uipaq, ushub, uipaq_driver, uipaq_devclass, NULL, 0);
 MODULE_DEPEND(uipaq, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uipaq, usb2_core, 1, 1, 1);
-MODULE_DEPEND(uipaq, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static int
 uipaq_probe(device_t dev)
diff --git a/sys/dev/usb2/serial/umct2.c b/sys/dev/usb2/serial/umct2.c
index 3d9c316..9c55c2a 100644
--- a/sys/dev/usb2/serial/umct2.c
+++ b/sys/dev/usb2/serial/umct2.c
@@ -237,7 +237,6 @@ static driver_t umct_driver = {
 DRIVER_MODULE(umct, ushub, umct_driver, umct_devclass, NULL, 0);
 MODULE_DEPEND(umct, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(umct, usb2_core, 1, 1, 1);
-MODULE_DEPEND(umct, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static int
 umct_probe(device_t dev)
diff --git a/sys/dev/usb2/serial/umodem2.c b/sys/dev/usb2/serial/umodem2.c
index 01d719d..66e6c69 100644
--- a/sys/dev/usb2/serial/umodem2.c
+++ b/sys/dev/usb2/serial/umodem2.c
@@ -278,7 +278,6 @@ static driver_t umodem_driver = {
 DRIVER_MODULE(umodem, ushub, umodem_driver, umodem_devclass, NULL, 0);
 MODULE_DEPEND(umodem, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(umodem, usb2_core, 1, 1, 1);
-MODULE_DEPEND(umodem, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 MODULE_VERSION(umodem, UMODEM_MODVER);
 
 static int
diff --git a/sys/dev/usb2/serial/umoscom2.c b/sys/dev/usb2/serial/umoscom2.c
index 3c142a5..a98bed8 100644
--- a/sys/dev/usb2/serial/umoscom2.c
+++ b/sys/dev/usb2/serial/umoscom2.c
@@ -296,7 +296,6 @@ static driver_t umoscom_driver = {
 DRIVER_MODULE(umoscom, ushub, umoscom_driver, umoscom_devclass, NULL, 0);
 MODULE_DEPEND(umoscom, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(umoscom, usb2_core, 1, 1, 1);
-MODULE_DEPEND(umoscom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static const struct usb2_device_id umoscom_devs[] = {
 	{USB_VPI(USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7703, 0)}
diff --git a/sys/dev/usb2/serial/uplcom2.c b/sys/dev/usb2/serial/uplcom2.c
index ebd8cb4..bb57b11 100644
--- a/sys/dev/usb2/serial/uplcom2.c
+++ b/sys/dev/usb2/serial/uplcom2.c
@@ -331,7 +331,6 @@ static driver_t uplcom_driver = {
 DRIVER_MODULE(uplcom, ushub, uplcom_driver, uplcom_devclass, NULL, 0);
 MODULE_DEPEND(uplcom, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uplcom, usb2_core, 1, 1, 1);
-MODULE_DEPEND(uplcom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 MODULE_VERSION(uplcom, UPLCOM_MODVER);
 
 static int
diff --git a/sys/dev/usb2/serial/usb2_serial.c b/sys/dev/usb2/serial/usb2_serial.c
index e9cf9e5..c41b919 100644
--- a/sys/dev/usb2/serial/usb2_serial.c
+++ b/sys/dev/usb2/serial/usb2_serial.c
@@ -147,8 +147,7 @@ static struct ttydevsw usb2_com_class = {
 	.tsw_free = usb2_com_free,
 };
 
-MODULE_DEPEND(ucom, usb2_core, 1, 1, 1);
-MODULE_VERSION(ucom, UCOM_MODVER);
+MODULE_DEPEND(usb2_serial, usb2_core, 1, 1, 1);
 MODULE_VERSION(usb2_serial, 1);
 
 #define	UCOM_UNIT_MAX 0x1000		/* exclusive */
diff --git a/sys/dev/usb2/serial/uvisor2.c b/sys/dev/usb2/serial/uvisor2.c
index 7280401..f5e6ff5 100644
--- a/sys/dev/usb2/serial/uvisor2.c
+++ b/sys/dev/usb2/serial/uvisor2.c
@@ -256,7 +256,6 @@ static driver_t uvisor_driver = {
 DRIVER_MODULE(uvisor, ushub, uvisor_driver, uvisor_devclass, NULL, 0);
 MODULE_DEPEND(uvisor, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uvisor, usb2_core, 1, 1, 1);
-MODULE_DEPEND(uvisor, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static const struct usb2_device_id uvisor_devs[] = {
 	{USB_VPI(USB_VENDOR_ACEECA, USB_PRODUCT_ACEECA_MEZ1000, UVISOR_FLAG_PALM4)},
diff --git a/sys/dev/usb2/serial/uvscom2.c b/sys/dev/usb2/serial/uvscom2.c
index 189b26b..96e3c72 100644
--- a/sys/dev/usb2/serial/uvscom2.c
+++ b/sys/dev/usb2/serial/uvscom2.c
@@ -283,7 +283,6 @@ static driver_t uvscom_driver = {
 DRIVER_MODULE(uvscom, ushub, uvscom_driver, uvscom_devclass, NULL, 0);
 MODULE_DEPEND(uvscom, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uvscom, usb2_core, 1, 1, 1);
-MODULE_DEPEND(uvscom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 MODULE_VERSION(uvscom, UVSCOM_MODVER);
 
 static int