]> err.no Git - linux-2.6/commit
USB: hid-core.c: fix duplicate USB_DEVICE_ID_GTCO_404
authorAdrian Bunk <bunk@stusta.de>
Mon, 4 Sep 2006 11:41:10 +0000 (13:41 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 7 Sep 2006 22:23:03 +0000 (15:23 -0700)
commitf064902457a775f7f70432832d67a5628c250456
tree32686001ddaf3f55f40e239f48bf8379e452db42
parent10387e5eb45c6e48d67102b88229f5bc6037461c
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>
drivers/usb/input/hid-core.c