From 493670fac29616c438bbbd463b48e169039509fd Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 24 Aug 2011 08:41:11 +0200 Subject: [PATCH] --- yaml --- r: 264919 b: refs/heads/master c: 2e5a08a3693e4c5bd251afc13246bc86fc9fafc3 h: refs/heads/master i: 264917: 771b3233a604a36217494a3cb5d1b1f2d6eb9212 264915: 0846dad38ac21f9de17b74639f91bbc8a6062efd 264911: a9e073cc02e3a517efc52318384d1fe08c27a5b7 v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/Kconfig | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 12c784b17771..846d8da85535 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d7a1c8a81244e8ea16d9a87b4434557f9103e3c +refs/heads/master: 2e5a08a3693e4c5bd251afc13246bc86fc9fafc3 diff --git a/trunk/drivers/usb/gadget/Kconfig b/trunk/drivers/usb/gadget/Kconfig index bb799d5b9ab6..fe5637983892 100644 --- a/trunk/drivers/usb/gadget/Kconfig +++ b/trunk/drivers/usb/gadget/Kconfig @@ -255,12 +255,11 @@ config USB_S3C_HSOTG integrated into the S3C64XX series SoC. config USB_IMX - tristate "Freescale IMX USB Peripheral Controller" - depends on ARCH_MX1 + tristate "Freescale i.MX1 USB Peripheral Controller" + depends on ARCH_MXC help - Freescale's IMX series include an integrated full speed - USB 1.1 device controller. The controller in the IMX series - is register-compatible. + Freescale's i.MX1 includes an integrated full speed + USB 1.1 device controller. It has Six fixed-function endpoints, as well as endpoint zero (for control transfers).