Kyosti took 173 lines out of i2c-dev.h in the main i2c branch because userspace shouldn't include kernel headers, and then merged that change into the lk2-4 branch too. But I don't recall seeing any replacement. Is there one? Should we undo the changes so we have working userspace utilities again or should we create a userspace version of i2c-dev.h? I'm not claiming the old i2c-dev.h was pretty but we need something.