diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /include/asm-um/delay.h | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/asm-um/delay.h')
| -rw-r--r-- | include/asm-um/delay.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-um/delay.h b/include/asm-um/delay.h index 40695576ca60..0985bda66750 100644 --- a/include/asm-um/delay.h +++ b/include/asm-um/delay.h | |||
| @@ -4,4 +4,6 @@ | |||
| 4 | #include "asm/arch/delay.h" | 4 | #include "asm/arch/delay.h" |
| 5 | #include "asm/archparam.h" | 5 | #include "asm/archparam.h" |
| 6 | 6 | ||
| 7 | #define MILLION 1000000 | ||
| 8 | |||
| 7 | #endif | 9 | #endif |