prvxxx: cxm_iic attach fails

Hello,

I'm using the port from
http://usleepless.110mb.com/pvrxxx_port.tgz
for my PVR-150 card.

I get this error on kldload cxm:
Sep 20 12:07:48 taxman kernel: cxm0: <Conexant iTVC16 MPEG Coder> mem 
0xd8000000-0xdbffffff irq 18 at device 15.0 on pci0
Sep 20 12:07:48 taxman kernel: cxm_iic0: <Conexant iTVC15 / iTVC16 I2C 
controller> on cxm0
Sep 20 12:07:48 taxman kernel: cxm_iic0: could not attach iicbb
Sep 20 12:07:48 taxman kernel: device_attach: cxm_iic0 attach returned 6
Sep 20 12:07:48 taxman kernel: cxm0: could not attach cxm_iic
Sep 20 12:07:48 taxman kernel: device_attach: cxm0 attach returned 6


Build fails on recent current because minor(9) is now a macro.

The cause is this define in cxm.h
#  define dev_t struct cdev *

I added this ugly hack to get it build. Not sure if it's correct but I don't 
think it's the cause of the problem.
#undef minor
#define minor(d)        ((d) ? (d)->si_drv0 : -1)

Haven't tested previously on CURRENT. But the card is working on RELENG_7:
Sep 20 12:38:50 taxman kernel: cxm0: <Conexant iTVC16 MPEG Coder> mem 
0xd8000000-0xdbffffff irq 18 at device 15.0 on pci0
Sep 20 12:38:50 taxman kernel: cxm_iic0: <Conexant iTVC15 / iTVC16 I2C 
controller> on cxm0
Sep 20 12:38:50 taxman kernel: iicbb0: <I2C bit-banging driver> on cxm_iic0
Sep 20 12:38:50 taxman kernel: iicbus0: <Philips I2C bus> on iicbb0 master-
only
Sep 20 12:38:50 taxman kernel: iicbus0: <unknown card> at addr 0
Sep 20 12:38:50 taxman kernel: iicbus0: <unknown card> at addr 0

Any ideas?

Thanks,
Stefan