fix compile issues with 4.7
diag: add proper diag drivers