---

yaml --- r: 264919 b: refs/heads/master c: 2e5a08a h: refs/heads/master i: 264917: 771b323 264915: 0846dad 264911: a9e073c v: v3
git-mirror · Aug 24, 2011 · 493670f · 493670f
1 parent 6d40f5b
commit 493670f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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).