2.5.68-bk10 - usbkbd.c compilation error

gcc -Wp,-MD,drivers/usb/input/.usbkbd.o.d -D__KERNEL__ -Iinclude -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=pentium4 -Iinclude/asm-i386/mach-default -fomit-frame-pointer -nostdinc
-iwithprefix include -DMODULE -DKBUILD_BASENAME=usbkbd
-DKBUILD_MODNAME=usbkbd -c -o drivers/usb/input/.tmp_usbkbd.o drivers/usb/input/usbkbd.c
drivers/usb/input/usbkbd.c:363: unknown field `devclass' specified in initializer
drivers/usb/input/usbkbd.c:363: `input_devclass' undeclared here (not in a function)
drivers/usb/input/usbkbd.c:363: initializer element is not constant drivers/usb/input/usbkbd.c:363: (near initialization for usb_kbd_driver.driver.name') drivers/usb/input/usbkbd.c:364: initializer element is not constant drivers/usb/input/usbkbd.c:364: (near initialization for usb_kbd_driver.driver')
make[3]: *** [drivers/usb/input/usbkbd.o] Error 1
make[2]: *** [drivers/usb/input] Error 2
make[1]: *** [drivers/usb] Error 2
make: *** [drivers] Error 2

the same problem exists in usbmouse.c

changes are the same like in :
http://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv2.5%2Fsnapshots%2Fincr%2Fpatch-2.5.68-bk9-bk10.bz2;z=74

This solves problem:

diff -u -r linux-2.5.68-bk10-org/drivers/usb/input/usbkbd.c linux-2.5.68-bk10-changed/drivers/usb/input/usbkbd.c
--- linux-2.5.68-bk10-org/drivers/usb/input/usbkbd.c 2003-04-30
18:50:43.000000000 +0100
+++ linux-2.5.68-bk10-changed/drivers/usb/input/usbkbd.c

2003-04-30 18:50:55.000000000 +0100
@@ -359,9 +359,6 @@
        .probe =        usb_kbd_probe,
        .disconnect =   usb_kbd_disconnect,
        .id_table =     usb_kbd_id_table,

- .driver = {
- .devclass = &input_devclass,
- },
};

static int __init usb_kbd_init(void)
diff -u -r linux-2.5.68-bk10-org/drivers/usb/input/usbmouse.c linux-2.5.68-bk10-changed/drivers/usb/input/usbmouse.c --- linux-2.5.68-bk10-org/drivers/usb/input/usbmouse.c 2003-04-30 18:54:11.000000000 +0100
+++ linux-2.5.68-bk10-changed/drivers/usb/input/usbmouse.c

2003-04-30 18:54:30.000000000 +0100
@@ -242,9 +242,6 @@
        .probe          = usb_mouse_probe,
        .disconnect     = usb_mouse_disconnect,
        .id_table       = usb_mouse_id_table,

- .driver = {
- .devclass = &input_devclass,
- },
};

static int __init usb_mouse_init(void)

Grzegorz Jaskiewicz <[email protected]>
K4 Labs

Bah, I missed these drivers, sorry.

I'll send this on to Linus in a bit.

thanks,

greg k-h