diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /drivers/usb/input/gtco.c | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'drivers/usb/input/gtco.c')
| -rw-r--r-- | drivers/usb/input/gtco.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/gtco.c b/drivers/usb/input/gtco.c index dbd207efb8f5..b2ca10f2fe0e 100644 --- a/drivers/usb/input/gtco.c +++ b/drivers/usb/input/gtco.c | |||
| @@ -223,7 +223,7 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report, | |||
| 223 | __u32 oldval[TAG_GLOB_MAX]; | 223 | __u32 oldval[TAG_GLOB_MAX]; |
| 224 | 224 | ||
| 225 | /* Debug stuff */ | 225 | /* Debug stuff */ |
| 226 | char maintype='x'; | 226 | char maintype = 'x'; |
| 227 | char globtype[12]; | 227 | char globtype[12]; |
| 228 | int indent = 0; | 228 | int indent = 0; |
| 229 | char indentstr[10] = ""; | 229 | char indentstr[10] = ""; |