5 files changed, 10 insertions, 10 deletions

diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index 1bfcd02ebeb5..a8f05239350e 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -244,3 +244,8 @@ config USB_YUREX
           To compile this driver as a module, choose M here: the
           module will be called yurex.
 
+config USB_EZUSB_FX2
+        tristate "Functions for loading firmware on EZUSB chips"
+        help
+          Say Y here if you need EZUSB device support.
+          (Cypress FX/FX2/FX2LP microcontrollers)
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
index 796ce7ebccc8..3e99a643294b 100644
--- a/drivers/usb/misc/Makefile
+++ b/drivers/usb/misc/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_USB_CYPRESS_CY7C63)	+= cypress_cy7c63.o
 obj-$(CONFIG_USB_CYTHERM)               += cytherm.o
 obj-$(CONFIG_USB_EMI26)                 += emi26.o
 obj-$(CONFIG_USB_EMI62)                 += emi62.o
+obj-$(CONFIG_USB_EZUSB_FX2)             += ezusb.o
 obj-$(CONFIG_USB_FTDI_ELAN)             += ftdi-elan.o
 obj-$(CONFIG_USB_IDMOUSE)               += idmouse.o
 obj-$(CONFIG_USB_IOWARRIOR)             += iowarrior.o
diff --git a/drivers/usb/serial/ezusb.c b/drivers/usb/misc/ezusb.c
index 4223d761223d..4223d761223d 100644
--- a/drivers/usb/serial/ezusb.c
+++ b/drivers/usb/misc/ezusb.c
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index f604f707a058..76f462241738 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -42,11 +42,6 @@ config USB_SERIAL_CONSOLE
 
           If unsure, say N.
 
-config USB_EZUSB
-        bool "Functions for loading firmware on EZUSB chips"
-        help
-            Say Y here if you need EZUSB device support.
-
 config USB_SERIAL_GENERIC
         bool "USB Generic Serial Driver"
         help
@@ -94,7 +89,7 @@ config USB_SERIAL_CH341
 
 config USB_SERIAL_WHITEHEAT
         tristate "USB ConnectTech WhiteHEAT Serial Driver"
-        select USB_EZUSB
+        select USB_EZUSB_FX2
         help
           Say Y here if you want to use a ConnectTech WhiteHEAT 4 port
           USB to serial converter device.
@@ -281,7 +276,7 @@ config USB_SERIAL_IUU
 
 config USB_SERIAL_KEYSPAN_PDA
         tristate "USB Keyspan PDA Single Port Serial Driver"
-        select USB_EZUSB
+        select USB_EZUSB_FX2
         help
           Say Y here if you want to use a Keyspan PDA single port USB to
           serial converter device.  This driver makes use of firmware
@@ -292,7 +287,7 @@ config USB_SERIAL_KEYSPAN_PDA
 
 config USB_SERIAL_KEYSPAN
         tristate "USB Keyspan USA-xxx Serial Driver"
-        select USB_EZUSB
+        select USB_EZUSB_FX2
         ---help---
           Say Y here if you want to use Keyspan USB to serial converter
           devices.  This driver makes use of Keyspan's official firmware
@@ -596,7 +591,7 @@ config USB_SERIAL_CYBERJACK
 
 config USB_SERIAL_XIRCOM
         tristate "USB Xircom / Entregra Single Port Serial Driver"
-        select USB_EZUSB
+        select USB_EZUSB_FX2
         help
           Say Y here if you want to use a Xircom or Entregra single port USB to
           serial converter device.  This driver makes use of firmware
diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
index 45871f9ad1e1..3b3e7308d476 100644
--- a/drivers/usb/serial/Makefile
+++ b/drivers/usb/serial/Makefile
@@ -9,7 +9,6 @@ obj-$(CONFIG_USB_SERIAL)			+= usbserial.o
 usbserial-y := usb-serial.o generic.o bus.o
 
 usbserial-$(CONFIG_USB_SERIAL_CONSOLE)  += console.o
-usbserial-$(CONFIG_USB_EZUSB)           += ezusb.o
 
 obj-$(CONFIG_USB_SERIAL_AIRCABLE)               += aircable.o
 obj-$(CONFIG_USB_SERIAL_ARK3116)                += ark3116.o