usb problem, triggered by ndis

Hello,

upgraded to todays -current and now I'm experiencing little annoying
problem with my usb devices. Output from log:

kernel: ndis0: <Intel(R) PRO/Wireless LAN 2100 3B Mini PCI Adapter> mem 0xc0200000-0xc0200fff irq 11 at device 2.0 on pci2
kernel: ndis0: NDIS API version: 5.1
kernel: ndis0: Ethernet address: 00:04:23:72:4a:75
kernel: ndis0: 11b rates: 11Mbps 2Mbps 1Mbps 5.5Mbps
kernel: ums0: at uhub1 port 1 (addr 2) disconnected
kernel: ums0: detached
moused: unable to open /dev/ums0: No such file or directory
kernel: ndis0: link up

The ports seem to be dead (tested with ums, umass) after I enable ndis.
These problems of course could be related to recent changes to usb code?
I will try to backout them as soon as possible and see if that helps (if
there won't be other suggestions ;)
My previous upgrade was on 05 November, so maybe there were other
changes as well (and backing usb changes won't help).
I'll upload dmesg.boot from verbose boot to
http://devnull.lt/files/dmesg.boot
BTW, in my kernel config I have such usb related devices:
device          uhci
device          ohci
device          usb
device          ugen
device          umass
device          ums
device          ucom
device          uftdi

probably I don't need both uhci and ohci?
The computer is IBM T40 notebook with 2xUSB 2.0 ports.

TIA
Paulius