summaryrefslogtreecommitdiffstats
path: root/arch/um/include/asm/delay.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-01-30 16:32:09 -0500
committerRichard Weinberger <richard@nod.at>2012-03-25 00:29:55 +0100
commitd3985d9ac6eeaf447a40d18b78a7e5443f95d790 (patch)
tree556fa5d09f618bb2d8753b7b91223e1dfd26022e /arch/um/include/asm/delay.h
parent69a3b4b28e29142f55de4d0661c3426ba9f1b6d3 (diff)
um: a bunch of headers can be killed by using generic-y
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/include/asm/delay.h')
-rw-r--r--arch/um/include/asm/delay.h18
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/um/include/asm/delay.h b/arch/um/include/asm/delay.h
deleted file mode 100644
index 8a5576d8eda..00000000000
--- a/arch/um/include/asm/delay.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __UM_DELAY_H
-#define __UM_DELAY_H
-
-/* Undefined on purpose */
-extern void __bad_udelay(void);
-extern void __bad_ndelay(void);
-
-extern void __udelay(unsigned long usecs);
-extern void __ndelay(unsigned long usecs);
-extern void __delay(unsigned long loops);
-
-#define udelay(n) ((__builtin_constant_p(n) && (n) > 20000) ? \
- __bad_udelay() : __udelay(n))
-
-#define ndelay(n) ((__builtin_constant_p(n) && (n) > 20000) ? \
- __bad_ndelay() : __ndelay(n))
-
-#endif