applied to 2.6, thanks.

Note I made the attached changes, otherwise the build would throw a 
bunch of errors and warnings.  Also, I merged it into 
drivers/net/s2io{.c,.h,-regs.h} since there isn't a need for a separate 
directory for just three files.

	Jeff