Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[linux-2.6] / include / asm-m68knommu / timex.h
1 #include <asm-m68k/timex.h>