Merge branch 'master'
[linux-2.6] / include / asm-um / delay.h
1 #ifndef __UM_DELAY_H
2 #define __UM_DELAY_H
3
4 #include "asm/arch/delay.h"
5 #include "asm/archparam.h"
6
7 #define MILLION 1000000
8
9 #endif