| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 | [log] [tgz] |
|---|---|---|
| author | Dmitry Torokhov <dtor@insightbb.com> | Tue May 01 00:24:54 2007 -0400 |
| committer | Dmitry Torokhov <dtor@insightbb.com> | Tue May 01 00:24:54 2007 -0400 |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd [diff] [blame] | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 [diff] [blame] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: drivers/usb/input/Makefile drivers/usb/input/gtco.c
diff --git a/drivers/usb/input/gtco.c b/drivers/usb/input/gtco.c index dbd207e..b2ca10f2f 100644 --- a/drivers/usb/input/gtco.c +++ b/drivers/usb/input/gtco.c
@@ -223,7 +223,7 @@ __u32 oldval[TAG_GLOB_MAX]; /* Debug stuff */ - char maintype='x'; + char maintype = 'x'; char globtype[12]; int indent = 0; char indentstr[10] = "";