Patching usb-serial

[Kevin]

What am I doing wrong here?  I need to apply this patch:
http://www.junxion.com/opensource/linux_highspeed_usbserial.html

This is Ubuntu Hoary 5.04 running 2.6.10-5-686 on my Thinkpad T40
laptop.

First I tried just applying the patchfile from the URL above, but all
three hunks failed.  So, I carefully made the three changes to the
source as shown in the diff.  

Still, I get errors on the compile, like this...

root at jet:/usr/src/linux/drivers/usb/serial# gcc -D__KERNEL__
-I/usr/src/linux/include -Wall -Wstrict-prototypes -Wno-trigraphs -O2
-fno-strict-aliasing -fno-common -fomit-frame-pointer -pipe
-mpreferred-stack-boundary=2 -march=i386 -DMODULE -nostdinc -iwithprefix
include -DKBUILD_BASENAME=usbserial -DEXPORT_SYMTAB -c usb-serial.c

In file included from /usr/src/linux/include/asm/hardirq.h:6,
                 from /usr/src/linux/include/linux/hardirq.h:6,
                 from /usr/src/linux/include/linux/interrupt.h:11,
                 from /usr/src/linux/include/linux/usb.h:15,
                 from usb-serial.c:15:
/usr/src/linux/include/linux/irq.h:71: error: `NR_IRQS' undeclared here
(not in a function)
In file included from /usr/src/linux/include/linux/irq.h:73,
                 from /usr/src/linux/include/asm/hardirq.h:6,
                 from /usr/src/linux/include/linux/hardirq.h:6,
                 from /usr/src/linux/include/linux/interrupt.h:11,
                 from /usr/src/linux/include/linux/usb.h:15,
                 from usb-serial.c:15:
/usr/src/linux/include/asm/hw_irq.h:28: error: `NR_IRQ_VECTORS'
undeclared here (not in a function)
/usr/src/linux/include/asm/hw_irq.h:32: error: `NR_IRQS' undeclared here
(not in a function)
In file included from /usr/src/linux/include/asm/hardirq.h:6,
                 from /usr/src/linux/include/linux/hardirq.h:6,
                 from /usr/src/linux/include/linux/interrupt.h:11,
                 from /usr/src/linux/include/linux/usb.h:15,
                 from usb-serial.c:15:
/usr/src/linux/include/linux/irq.h:78: error: `NR_IRQS' undeclared here
(not in a function)
usb-serial.c: In function `usb_serial_probe':
usb-serial.c:601: error: structure has no member named `lock'


Anyone know what I am missing here?

...Kevin