# Fix a confusing parameter name in the __const_udelay prototypes. # The UML changes here are suspect, and probably wrong, but also fairly # harmless. # Fix a confusing parameter name in the __const_udelay prototypes. # The UML changes here are suspect, and probably wrong, but also fairly # harmless. Index: linux-2.6.17/include/asm-m32r/delay.h =================================================================== --- linux-2.6.17.orig/include/asm-m32r/delay.h 2007-10-17 12:11:50.000000000 -0400 +++ linux-2.6.17/include/asm-m32r/delay.h 2007-11-19 11:56:27.000000000 -0500 @@ -12,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) ? \ Index: linux-2.6.17/include/asm-sh/delay.h =================================================================== --- linux-2.6.17.orig/include/asm-sh/delay.h 2007-10-17 12:11:50.000000000 -0400 +++ linux-2.6.17/include/asm-sh/delay.h 2007-11-19 11:56:27.000000000 -0500 @@ -12,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) ? \ Index: linux-2.6.17/include/asm-x86/delay.h =================================================================== --- linux-2.6.17.orig/include/asm-x86/delay.h 2007-11-19 11:57:13.000000000 -0500 +++ linux-2.6.17/include/asm-x86/delay.h 2007-11-19 11:57:31.000000000 -0500 @@ -13,7 +13,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); /* 0x10c7 is 2**32 / 1000000 (rounded up) */