Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70c048a2 authored by Rene Buergel's avatar Rene Buergel Committed by Greg Kroah-Hartman
Browse files

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: default avatarRené Bürgel <rene.buergel@sohard.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e0423dee

drivers/usb/misc/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -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)

drivers/usb/misc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/usb/serial/ezusb.c→drivers/usb/misc/ezusb.c

+0 −0

File moved.

View file

drivers/usb/serial/Kconfig

+4 −9
Original line number Diff line number Diff line
@@ -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

drivers/usb/serial/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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