diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-10-31 17:13:10 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-31 17:13:10 +0100 |
| commit | 7b3b6e42032e94a6132a85642e95106f5346650e (patch) | |
| tree | 8b2262291341d8a9f9b1e7e3c63a3289bb6c6de6 /include/asm-um/delay.h | |
| parent | Merge branch 'topic/fix/asoc' into topic/asoc (diff) | |
| parent | Linux 2.6.28-rc2 (diff) | |
| download | linux-7b3b6e42032e94a6132a85642e95106f5346650e.tar.xz linux-7b3b6e42032e94a6132a85642e95106f5346650e.zip | |
Merge commit 'v2.6.28-rc2' into topic/asoc
Diffstat (limited to 'include/asm-um/delay.h')
| -rw-r--r-- | include/asm-um/delay.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/asm-um/delay.h b/include/asm-um/delay.h deleted file mode 100644 index c71e32b6741e..000000000000 --- a/include/asm-um/delay.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef __UM_DELAY_H -#define __UM_DELAY_H - -#define MILLION 1000000 - -/* Undefined on purpose */ -extern void __bad_udelay(void); - -extern void __udelay(unsigned long usecs); -extern void __delay(unsigned long loops); - -#define udelay(n) ((__builtin_constant_p(n) && (n) > 20000) ? \ - __bad_udelay() : __udelay(n)) - -/* It appears that ndelay is not used at all for UML, and has never been - * implemented. */ -extern void __unimplemented_ndelay(void); -#define ndelay(n) __unimplemented_ndelay() - -#endif |