I _think_ I got this one right (at least, it booted on hw).  It should
allow generic kernels to include the sn2 code.