diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-09-04 07:41:10 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-09-07 18:23:03 -0400 |
| commit | f064902457a775f7f70432832d67a5628c250456 (patch) | |
| tree | 32686001ddaf3f55f40e239f48bf8379e452db42 /drivers/usb/input | |
| parent | 10387e5eb45c6e48d67102b88229f5bc6037461c (diff) | |
USB: hid-core.c: fix duplicate USB_DEVICE_ID_GTCO_404
On Fri, Sep 01, 2006 at 01:58:18AM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.18-rc4-mm3:
>...
> +gregkh-usb-hid-core.c-adds-all-gtco-calcomp-digitizers-and-interwrite-school-products-to-blacklist.patch
>...
> USB tree updates.
>...
The GNU C compiler spotted the following bug:
<-- snip -->
...
CC drivers/usb/input/hid-core.o
/home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/drivers/usb/input/hid-core.c:1446:1: warning: "USB_DEVICE_ID_GTCO_404" redefined
/home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/drivers/usb/input/hid-core.c:1445:1: warning: this is the location of the previous definition
...
<-- snip -->
This patch fixes this cut'n'paste error.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/input')
| -rw-r--r-- | drivers/usb/input/hid-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index acb24c6219d9..a2c56b2de589 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c | |||
| @@ -1444,7 +1444,7 @@ void hid_init_reports(struct hid_device *hid) | |||
| 1444 | #define USB_DEVICE_ID_GTCO_402 0x0402 | 1444 | #define USB_DEVICE_ID_GTCO_402 0x0402 |
| 1445 | #define USB_DEVICE_ID_GTCO_403 0x0403 | 1445 | #define USB_DEVICE_ID_GTCO_403 0x0403 |
| 1446 | #define USB_DEVICE_ID_GTCO_404 0x0404 | 1446 | #define USB_DEVICE_ID_GTCO_404 0x0404 |
| 1447 | #define USB_DEVICE_ID_GTCO_404 0x0405 | 1447 | #define USB_DEVICE_ID_GTCO_405 0x0405 |
| 1448 | #define USB_DEVICE_ID_GTCO_500 0x0500 | 1448 | #define USB_DEVICE_ID_GTCO_500 0x0500 |
| 1449 | #define USB_DEVICE_ID_GTCO_501 0x0501 | 1449 | #define USB_DEVICE_ID_GTCO_501 0x0501 |
| 1450 | #define USB_DEVICE_ID_GTCO_502 0x0502 | 1450 | #define USB_DEVICE_ID_GTCO_502 0x0502 |
| @@ -1657,7 +1657,7 @@ static const struct hid_blacklist { | |||
| 1657 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_402, HID_QUIRK_IGNORE }, | 1657 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_402, HID_QUIRK_IGNORE }, |
| 1658 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_403, HID_QUIRK_IGNORE }, | 1658 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_403, HID_QUIRK_IGNORE }, |
| 1659 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_404, HID_QUIRK_IGNORE }, | 1659 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_404, HID_QUIRK_IGNORE }, |
| 1660 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_404, HID_QUIRK_IGNORE }, | 1660 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_405, HID_QUIRK_IGNORE }, |
| 1661 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_500, HID_QUIRK_IGNORE }, | 1661 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_500, HID_QUIRK_IGNORE }, |
| 1662 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_501, HID_QUIRK_IGNORE }, | 1662 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_501, HID_QUIRK_IGNORE }, |
| 1663 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_502, HID_QUIRK_IGNORE }, | 1663 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_502, HID_QUIRK_IGNORE }, |