Comment 59 for bug 1158689

The fix for that compilation issue is contained in d1b167e168bdac0b6af11e7a8c601773639fc419

Basically you need to make nouveau_channel_idle return an int, and just stick a 'return ret' at the end. And adjust the prototype in nouveau_drv.h.