tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
USB: serial: keyspan_pda: fix Entrega company name spelling
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>
authored by
Mark Knibbs
and committed by
Johan Hovold
5f9f975b
f114040e
+11
-11
+1
-1
Documentation/usb/usb-serial.txt
+1
-1
Documentation/usb/usb-serial.txt
···
145
145
Single port DB-9 serial adapter, pushed as a PDA adapter for iMacs (mostly
146
146
sold in Macintosh catalogs, comes in a translucent white/green dongle).
147
147
Fairly simple device. Firmware is homebrew.
148
-
This driver also works for the Xircom/Entrgra single port serial adapter.
148
+
This driver also works for the Xircom/Entrega single port serial adapter.
149
149
150
150
Current status:
151
151
Things that work:
+2
-2
drivers/usb/serial/Kconfig
+2
-2
drivers/usb/serial/Kconfig
···
606
606
If unsure, say N.
607
607
608
608
config USB_SERIAL_XIRCOM
609
-
tristate "USB Xircom / Entregra Single Port Serial Driver"
609
+
tristate "USB Xircom / Entrega Single Port Serial Driver"
610
610
select USB_EZUSB_FX2
611
611
help
612
-
Say Y here if you want to use a Xircom or Entregra single port USB to
612
+
Say Y here if you want to use a Xircom or Entrega single port USB to
613
613
serial converter device. This driver makes use of firmware
614
614
developed from scratch by Brian Warner.
615
615
+8
-8
drivers/usb/serial/keyspan_pda.c
+8
-8
drivers/usb/serial/keyspan_pda.c
···
1
1
/*
2
-
* USB Keyspan PDA / Xircom / Entregra Converter driver
2
+
* USB Keyspan PDA / Xircom / Entrega Converter driver
3
3
*
4
4
* Copyright (C) 1999 - 2001 Greg Kroah-Hartman <greg@kroah.com>
5
5
* Copyright (C) 1999, 2000 Brian Warner <warner@lothar.com>
···
58
58
#define KEYSPAN_PDA_FAKE_ID 0x0103
59
59
#define KEYSPAN_PDA_ID 0x0104 /* no clue */
60
60
61
-
/* For Xircom PGSDB9 and older Entregra version of the same device */
61
+
/* For Xircom PGSDB9 and older Entrega version of the same device */
62
62
#define XIRCOM_VENDOR_ID 0x085a
63
63
#define XIRCOM_FAKE_ID 0x8027
64
-
#define ENTREGRA_VENDOR_ID 0x1645
65
-
#define ENTREGRA_FAKE_ID 0x8093
64
+
#define ENTREGA_VENDOR_ID 0x1645
65
+
#define ENTREGA_FAKE_ID 0x8093
66
66
67
67
static const struct usb_device_id id_table_combined[] = {
68
68
#ifdef KEYSPAN
···
70
70
#endif
71
71
#ifdef XIRCOM
72
72
{ USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) },
73
-
{ USB_DEVICE(ENTREGRA_VENDOR_ID, ENTREGRA_FAKE_ID) },
73
+
{ USB_DEVICE(ENTREGA_VENDOR_ID, ENTREGA_FAKE_ID) },
74
74
#endif
75
75
{ USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_ID) },
76
76
{ } /* Terminating entry */
···
93
93
#ifdef XIRCOM
94
94
static const struct usb_device_id id_table_fake_xircom[] = {
95
95
{ USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) },
96
-
{ USB_DEVICE(ENTREGRA_VENDOR_ID, ENTREGRA_FAKE_ID) },
96
+
{ USB_DEVICE(ENTREGA_VENDOR_ID, ENTREGA_FAKE_ID) },
97
97
{ }
98
98
};
99
99
#endif
···
667
667
#endif
668
668
#ifdef XIRCOM
669
669
else if ((le16_to_cpu(serial->dev->descriptor.idVendor) == XIRCOM_VENDOR_ID) ||
670
-
(le16_to_cpu(serial->dev->descriptor.idVendor) == ENTREGRA_VENDOR_ID))
670
+
(le16_to_cpu(serial->dev->descriptor.idVendor) == ENTREGA_VENDOR_ID))
671
671
fw_name = "keyspan_pda/xircom_pgs.fw";
672
672
#endif
673
673
else {
···
744
744
.owner = THIS_MODULE,
745
745
.name = "xircom_no_firm",
746
746
},
747
-
.description = "Xircom / Entregra PGS - (prerenumeration)",
747
+
.description = "Xircom / Entrega PGS - (prerenumeration)",
748
748
.id_table = id_table_fake_xircom,
749
749
.num_ports = 1,
750
750
.attach = keyspan_pda_fake_startup,