From 7e83d52697ca83af01176f75dc09edceb620db23 Mon Sep 17 00:00:00 2001 From: Paulius Zaleckas Date: Tue, 9 Jun 2009 11:11:16 +0300 Subject: [PATCH] --- yaml --- r: 155359 b: refs/heads/master c: c03e7d4bc1c39ae74a5e9f7bd7e9fd12898e42b8 h: refs/heads/master i: 155357: fb345d3d1cac83cfc038191b3b5df829d9aed522 155355: 8feb2c32df4ab886e7e795ddbc576d1b0a130c91 155351: 59b1249a329dfec139533283b5b902b5ca77916f 155343: 0089aae44647e5479a4795ddb2413c3a47afa937 155327: dc299a2e383ede1243f70b4268a783b63fc548d8 v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/Kconfig | 42 ++++++++++++++++---------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/[refs] b/[refs] index 16a0ce12d080..14afb887a802 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8540d66615c39010168ab97eaafb476ec2851298 +refs/heads/master: c03e7d4bc1c39ae74a5e9f7bd7e9fd12898e42b8 diff --git a/trunk/drivers/usb/gadget/Kconfig b/trunk/drivers/usb/gadget/Kconfig index 5d1ddf485d1e..61518c9cdaa4 100644 --- a/trunk/drivers/usb/gadget/Kconfig +++ b/trunk/drivers/usb/gadget/Kconfig @@ -286,6 +286,27 @@ config USB_S3C_HSOTG default USB_GADGET select USB_GADGET_SELECTED +config USB_GADGET_IMX + boolean "Freescale IMX USB Peripheral Controller" + depends on ARCH_MX1 + help + Freescale's IMX series include an integrated full speed + USB 1.1 device controller. The controller in the IMX series + is register-compatible. + + It has Six fixed-function endpoints, as well as endpoint + zero (for control transfers). + + Say "y" to link the driver statically, or "m" to build a + dynamically linked module called "imx_udc" and force all + gadget drivers to also be dynamically linked. + +config USB_IMX + tristate + depends on USB_GADGET_IMX + default USB_GADGET + select USB_GADGET_SELECTED + config USB_GADGET_S3C2410 boolean "S3C2410 USB Device Controller" depends on ARCH_S3C2410 @@ -321,27 +342,6 @@ config USB_GADGET_MUSB_HDRC This OTG-capable silicon IP is used in dual designs including the TI DaVinci, OMAP 243x, OMAP 343x, TUSB 6010, and ADI Blackfin -config USB_GADGET_IMX - boolean "Freescale IMX USB Peripheral Controller" - depends on ARCH_MX1 - help - Freescale's IMX series include an integrated full speed - USB 1.1 device controller. The controller in the IMX series - is register-compatible. - - It has Six fixed-function endpoints, as well as endpoint - zero (for control transfers). - - Say "y" to link the driver statically, or "m" to build a - dynamically linked module called "imx_udc" and force all - gadget drivers to also be dynamically linked. - -config USB_IMX - tristate - depends on USB_GADGET_IMX - default USB_GADGET - select USB_GADGET_SELECTED - config USB_GADGET_M66592 boolean "Renesas M66592 USB Peripheral Controller" select USB_GADGET_DUALSPEED