On Mon, Sep 04, 2006 at 01:41:10PM +0200, Adrian Bunk wrote:
> 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.
Thanks, Adrian. Greg, please apply.
>
> Signed-off-by: Adrian Bunk <[email protected]>
>
> --- linux-2.6.18-rc5-mm1/drivers/usb/input/hid-core.c.old 2006-09-03 21:00:25.000000000 +0200
> +++ linux-2.6.18-rc5-mm1/drivers/usb/input/hid-core.c 2006-09-03 21:00:44.000000000 +0200
> @@ -1443,7 +1443,7 @@
> #define USB_DEVICE_ID_GTCO_402 0x0402
> #define USB_DEVICE_ID_GTCO_403 0x0403
> #define USB_DEVICE_ID_GTCO_404 0x0404
> -#define USB_DEVICE_ID_GTCO_404 0x0405
> +#define USB_DEVICE_ID_GTCO_405 0x0405
> #define USB_DEVICE_ID_GTCO_500 0x0500
> #define USB_DEVICE_ID_GTCO_501 0x0501
> #define USB_DEVICE_ID_GTCO_502 0x0502
> @@ -1663,7 +1663,7 @@
> { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_402, HID_QUIRK_IGNORE },
> { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_403, HID_QUIRK_IGNORE },
> { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_404, HID_QUIRK_IGNORE },
> - { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_404, HID_QUIRK_IGNORE },
> + { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_405, HID_QUIRK_IGNORE },
> { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_500, HID_QUIRK_IGNORE },
> { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_501, HID_QUIRK_IGNORE },
> { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_502, HID_QUIRK_IGNORE },
>
>
>
--
Vojtech Pavlik
Director SuSE Labs
--
VGER BF report: H 0.0165713
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
