revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / arch / arm / include / asm / delay.h

diff --git a/arch/arm/include/asm/delay.h b/arch/arm/include/asm/delay.h
index 57f1fa0e983b7c919a06a87dc93e75ec74284e39..b2deda1815496d83ab3dde5c9eb2c4f5194c7b1e 100644 (file)
--- a/arch/arm/include/asm/delay.h
+++ b/arch/arm/include/asm/delay.h
@@ -8,9 +8,6 @@
 
 #include <asm/param.h> /* HZ */
 
-#ifdef CONFIG_ARCH_PROVIDES_UDELAY
-#include <mach/delay.h>
-#else
 extern void __delay(int loops);
 
 /*
@@ -43,6 +40,5 @@ extern void __const_udelay(unsigned long);
                        __const_udelay((n) * ((2199023U*HZ)>>11))) :    \
          __udelay(n))
 
-#endif /* defined(ARCH_PROVIDES_UDELAY) */
 #endif /* defined(_ARM_DELAY_H) */