Fixes in this version include:

1.  Changed around the DRIVER_LOCK macro solely for 2.1.96.  2.0.33 is
    unaffected by this change.
2.  Remove the section of code that warns about a spurious interrupt at
    boot time.  The way we now handle interrupts makes this code get
    triggered falsely any time we have two controllers sharing the same
    interrupt.
3.  Make sure the right header file was in the patch this time %^)

That's it.