Oops. I've moved some stuff around and must have a slightly different kernel tree than you. It's basically changing the OutSwi lines anyway. Should only be a few references of it.

- Trevor