aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/Kconfig
diff options
context:
space:
mode:
authorMark Knibbs <markk@clara.co.uk>2014-10-04 12:19:59 +0100
committerBen Hutchings <ben@decadent.org.uk>2015-05-09 23:16:31 +0100
commit155b62716478a9328601cdd693824db0fc83aa6e (patch)
tree1b82f33335e164e876af4f8782ef5e58fb8b7021 /drivers/usb/serial/Kconfig
parentca2ed49671c399e43c546f1a454267c2f0ba7061 (diff)
downloadkernel_samsung_smdk4412-155b62716478a9328601cdd693824db0fc83aa6e.zip
kernel_samsung_smdk4412-155b62716478a9328601cdd693824db0fc83aa6e.tar.gz
kernel_samsung_smdk4412-155b62716478a9328601cdd693824db0fc83aa6e.tar.bz2
USB: serial: keyspan_pda: fix Entrega company name spelling
commit 5f9f975b7984ffec0a25f55e58246aebf68794f4 upstream. Entrega is misspelled as Entregra or Entrgra, so fix that. Signed-off-by: Mark Knibbs <markk@clara.co.uk> Signed-off-by: Johan Hovold <johan@kernel.org> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb/serial/Kconfig')
-rw-r--r--drivers/usb/serial/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 677f577..1888da7 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -578,10 +578,10 @@ config USB_SERIAL_CYBERJACK
If unsure, say N.
config USB_SERIAL_XIRCOM
- tristate "USB Xircom / Entregra Single Port Serial Driver"
+ tristate "USB Xircom / Entrega Single Port Serial Driver"
select USB_EZUSB
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 Entrega single port USB to
serial converter device. This driver makes use of firmware
developed from scratch by Brian Warner.