diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /include/asm-um/delay.h | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
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 |