diff --git a/[refs] b/[refs] index f34e4cc1c1b7..8d02d65c5e65 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42bfc7b44f724fb5ce838fc2f552a3eb8cd768ec +refs/heads/master: 4ddd9ec17af6a7c539f4a12758905340c00847d6 diff --git a/trunk/drivers/usb/gadget/Kconfig b/trunk/drivers/usb/gadget/Kconfig index a460706de984..c6a8c6b1116a 100644 --- a/trunk/drivers/usb/gadget/Kconfig +++ b/trunk/drivers/usb/gadget/Kconfig @@ -588,6 +588,7 @@ config USB_G_PRINTER config USB_CDC_COMPOSITE tristate "CDC Composite Device (Ethernet and ACM)" + depends on NET help This driver provides two functions in one configuration: a CDC Ethernet (ECM) link, and a CDC ACM (serial port) link.