fix build with new s2w and dt2w drivers