linux

Commit Graph

Author	SHA1	Message	Date
Greg Kroah-Hartman	b472b8e22f	Merge 3.7-rc3 into usb-next. This pulls in all of the USB changes in 3.7-rc3 into usb-next and resolves the merge issue with: drivers/usb/misc/ezusb.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2012-10-29 09:04:39 -07:00
Greg Kroah-Hartman	c30186e51e	USB: ezusb: unexport some functions that aren't being used When the ezusb code was split out, support was added for the fx2 chip type, but no one is using these functions, so comment it out. If someone needs it, it can be added back in the future. Also properly include <linux/usb/ezusb.h> into the ezusb.c file, to ensure we catch any function prototype mis-matches Reported-by: Fengguang Wu <fengguang.wu@intel.com> Cc: René Bürgel <rene.buergel@sohard.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2012-10-24 14:19:16 -07:00
Dave Jones	197ef5ef37	USB: Add missing license tag to ezusb driver. ezusb: module license 'unspecified' taints kernel Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2012-10-23 19:42:31 -07:00
Rene Buergel	70c048a238	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>	2012-09-26 14:20:28 -07:00

4 Commits