Merge branch 'fix/asoc' into for-linus
[linux-2.6] / arch / m68k / include / asm / timex.h
1 #ifdef __uClinux__
2 #include "timex_no.h"
3 #else
4 #include "timex_mm.h"
5 #endif