From a84b00fa63db878c98b03973dc4b9314b0a49a2d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 11 Mar 2009 11:03:49 -0700 Subject: [PATCH] --- yaml --- r: 133550 b: refs/heads/master c: 03ee251546a9360cbb4c27c250d128dcbcfd9931 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/Kconfig | 10 +++++----- trunk/drivers/usb/serial/Makefile | 2 +- trunk/drivers/usb/serial/{cp2101.c => cp210x.c} | 0 4 files changed, 7 insertions(+), 7 deletions(-) rename trunk/drivers/usb/serial/{cp2101.c => cp210x.c} (100%) diff --git a/[refs] b/[refs] index 87256d9ef88b..9d553a11e310 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97324955c62aaa104edea2ef4370dc8882a5ab82 +refs/heads/master: 03ee251546a9360cbb4c27c250d128dcbcfd9931 diff --git a/trunk/drivers/usb/serial/Kconfig b/trunk/drivers/usb/serial/Kconfig index 4afe73e8ec4a..a65f9196b0a0 100644 --- a/trunk/drivers/usb/serial/Kconfig +++ b/trunk/drivers/usb/serial/Kconfig @@ -116,14 +116,14 @@ config USB_SERIAL_DIGI_ACCELEPORT To compile this driver as a module, choose M here: the module will be called digi_acceleport. -config USB_SERIAL_CP2101 - tristate "USB CP2101 UART Bridge Controller" +config USB_SERIAL_CP210X + tristate "USB CP210x family of UART Bridge Controllers" help - Say Y here if you want to use a CP2101/CP2102 based USB to RS232 - converter. + Say Y here if you want to use a CP2101/CP2102/CP2103 based USB + to RS232 converters. To compile this driver as a module, choose M here: the - module will be called cp2101. + module will be called cp210x. config USB_SERIAL_CYPRESS_M8 tristate "USB Cypress M8 USB Serial Driver" diff --git a/trunk/drivers/usb/serial/Makefile b/trunk/drivers/usb/serial/Makefile index 94043babe1d3..66619beb6cc0 100644 --- a/trunk/drivers/usb/serial/Makefile +++ b/trunk/drivers/usb/serial/Makefile @@ -15,7 +15,7 @@ obj-$(CONFIG_USB_SERIAL_AIRCABLE) += aircable.o obj-$(CONFIG_USB_SERIAL_ARK3116) += ark3116.o obj-$(CONFIG_USB_SERIAL_BELKIN) += belkin_sa.o obj-$(CONFIG_USB_SERIAL_CH341) += ch341.o -obj-$(CONFIG_USB_SERIAL_CP2101) += cp2101.o +obj-$(CONFIG_USB_SERIAL_CP210X) += cp210x.o obj-$(CONFIG_USB_SERIAL_CYBERJACK) += cyberjack.o obj-$(CONFIG_USB_SERIAL_CYPRESS_M8) += cypress_m8.o obj-$(CONFIG_USB_SERIAL_DEBUG) += usb_debug.o diff --git a/trunk/drivers/usb/serial/cp2101.c b/trunk/drivers/usb/serial/cp210x.c similarity index 100% rename from trunk/drivers/usb/serial/cp2101.c rename to trunk/drivers/usb/serial/cp210x.c