diff options
author | Anton Altaparmakov | 2005-05-21 23:00:02 +0200 |
---|---|---|
committer | Anton Altaparmakov | 2005-05-21 23:00:02 +0200 |
commit | 67394f8f069c2fdf90f3b6d851824c07815442af (patch) | |
tree | 0c33e62d34dbaecea434ae9ece3cc0c56db8b1f7 /include/asm-um/delay.h | |
parent | Merge with /usr/src/ntfs-2.6.git (diff) | |
parent | Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git (diff) | |
download | kernel-qcow2-linux-67394f8f069c2fdf90f3b6d851824c07815442af.tar.gz kernel-qcow2-linux-67394f8f069c2fdf90f3b6d851824c07815442af.tar.xz kernel-qcow2-linux-67394f8f069c2fdf90f3b6d851824c07815442af.zip |
Merge with /usr/src/ntfs-2.6.git
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 @@ #include "asm/arch/delay.h" #include "asm/archparam.h" +#define MILLION 1000000 + #endif |