Shift shaft spline count

What Suzuki models use the 21 spline count coarse shift shaft? I know that most of the other japanese bikes use a 30 or so teeth finer spline shaft.

I am trying to go from a remote Forward control setup on a Suzuki Savage Ryca build to not rear sets, but mid sets, with the shift lever mounted directly to the transmission. Local junk yards and parts houses have no clue what will fit.

Thanks,

BigR