UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB: ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc 

This patch
- moves drivers/usb/serial/ezusb.c to drivers/usb/misc/
- renamed CONFIG_USB_EZUSB to CONFIG_USB_EZUSB_FX2 to avoid build errors
- adapts Makefiles and Kconfigs switching from bool to tristate for CONFIG_USB_EZUSB_FX2

Signed-off-by: René Bürgel <rene.buergel@sohard.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Rene Buergel 2012-09-26 22:20:19 +02:00 committed by Greg Kroah-Hartman
parent e0423dee89
commit 70c048a238
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/usb/misc/Kconfig
View File

@ -244,3 +244,8 @@ config USB_YUREX
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called yurex. 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)

1
drivers/usb/misc/Makefile
View File

@ -11,6 +11,7 @@ obj-$(CONFIG_USB_CYPRESS_CY7C63) += cypress_cy7c63.o
obj-$(CONFIG_USB_CYTHERM) += cytherm.o obj-$(CONFIG_USB_CYTHERM) += cytherm.o
obj-$(CONFIG_USB_EMI26) += emi26.o obj-$(CONFIG_USB_EMI26) += emi26.o
obj-$(CONFIG_USB_EMI62) += emi62.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_FTDI_ELAN) += ftdi-elan.o
obj-$(CONFIG_USB_IDMOUSE) += idmouse.o obj-$(CONFIG_USB_IDMOUSE) += idmouse.o
obj-$(CONFIG_USB_IOWARRIOR) += iowarrior.o obj-$(CONFIG_USB_IOWARRIOR) += iowarrior.o

0
drivers/usb/serial/ezusb.c → drivers/usb/misc/ezusb.c
View File

13
drivers/usb/serial/Kconfig
View File

@ -42,11 +42,6 @@ config USB_SERIAL_CONSOLE
If unsure, say N. 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 config USB_SERIAL_GENERIC
bool "USB Generic Serial Driver" bool "USB Generic Serial Driver"
help help
@ -94,7 +89,7 @@ config USB_SERIAL_CH341
config USB_SERIAL_WHITEHEAT config USB_SERIAL_WHITEHEAT
tristate "USB ConnectTech WhiteHEAT Serial Driver" tristate "USB ConnectTech WhiteHEAT Serial Driver"
select USB_EZUSB select USB_EZUSB_FX2
help help
Say Y here if you want to use a ConnectTech WhiteHEAT 4 port Say Y here if you want to use a ConnectTech WhiteHEAT 4 port
USB to serial converter device. USB to serial converter device.
@ -281,7 +276,7 @@ config USB_SERIAL_IUU
config USB_SERIAL_KEYSPAN_PDA config USB_SERIAL_KEYSPAN_PDA
tristate "USB Keyspan PDA Single Port Serial Driver" tristate "USB Keyspan PDA Single Port Serial Driver"
select USB_EZUSB select USB_EZUSB_FX2
help help
Say Y here if you want to use a Keyspan PDA single port USB to Say Y here if you want to use a Keyspan PDA single port USB to
serial converter device. This driver makes use of firmware serial converter device. This driver makes use of firmware
@ -292,7 +287,7 @@ config USB_SERIAL_KEYSPAN_PDA
config USB_SERIAL_KEYSPAN config USB_SERIAL_KEYSPAN
tristate "USB Keyspan USA-xxx Serial Driver" tristate "USB Keyspan USA-xxx Serial Driver"
select USB_EZUSB select USB_EZUSB_FX2
---help--- ---help---
Say Y here if you want to use Keyspan USB to serial converter Say Y here if you want to use Keyspan USB to serial converter
devices. This driver makes use of Keyspan's official firmware devices. This driver makes use of Keyspan's official firmware
@ -596,7 +591,7 @@ config USB_SERIAL_CYBERJACK
config USB_SERIAL_XIRCOM config USB_SERIAL_XIRCOM
tristate "USB Xircom / Entregra Single Port Serial Driver" tristate "USB Xircom / Entregra Single Port Serial Driver"
select USB_EZUSB select USB_EZUSB_FX2
help help
Say Y here if you want to use a Xircom or Entregra single port USB to 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 serial converter device. This driver makes use of firmware

1
drivers/usb/serial/Makefile
View File

@ -9,7 +9,6 @@ obj-$(CONFIG_USB_SERIAL) += usbserial.o
usbserial-y := usb-serial.o generic.o bus.o usbserial-y := usb-serial.o generic.o bus.o
usbserial-$(CONFIG_USB_SERIAL_CONSOLE) += console.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_AIRCABLE) += aircable.o
obj-$(CONFIG_USB_SERIAL_ARK3116) += ark3116.o obj-$(CONFIG_USB_SERIAL_ARK3116) += ark3116.o