Merge branch 'linus' into core/iommu

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

diff --git a/include/asm-m32r/delay.h b/include/asm-m32r/delay.h
index f285eaee7d2739db9989931e22909af47c564412..9dd9e999ea69cdd0a20b7c9e15e6b5788b03f6d5 100644 (file)
--- a/include/asm-m32r/delay.h
+++ b/include/asm-m32r/delay.h
@@ -1,8 +1,6 @@
 #ifndef _ASM_M32R_DELAY_H
 #define _ASM_M32R_DELAY_H
 
-/* $Id$ */
-
 /*
  * Copyright (C) 1993 Linus Torvalds
  *
@@ -14,7 +12,7 @@ extern void __bad_ndelay(void);
 
 extern void __udelay(unsigned long usecs);
 extern void __ndelay(unsigned long nsecs);
-extern void __const_udelay(unsigned long usecs);
+extern void __const_udelay(unsigned long xloops);
 extern void __delay(unsigned long loops);
 
 #define udelay(n) (__builtin_constant_p(n) ? \