diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/io_32.h | 10 | ||||
| -rw-r--r-- | include/asm-x86/io_64.h | 10 |
2 files changed, 6 insertions, 14 deletions
diff --git a/include/asm-x86/io_32.h b/include/asm-x86/io_32.h index a8d25c38b91..2a04bd17eac 100644 --- a/include/asm-x86/io_32.h +++ b/include/asm-x86/io_32.h @@ -250,15 +250,11 @@ static inline void flush_write_buffers(void) #endif /* __KERNEL__ */ -#ifndef CONFIG_UDELAY_IO_DELAY -extern void io_delay_init(void); -#else -static inline void io_delay_init(void) -{ -} -#endif extern void native_io_delay(void); +extern int io_delay_type; +extern void io_delay_init(void); + #if defined(CONFIG_PARAVIRT) #include <asm/paravirt.h> #else diff --git a/include/asm-x86/io_64.h b/include/asm-x86/io_64.h index 5bebaf96169..dbcc03aa1c6 100644 --- a/include/asm-x86/io_64.h +++ b/include/asm-x86/io_64.h @@ -35,15 +35,11 @@ * - Arnaldo Carvalho de Melo <acme@conectiva.com.br> */ -#ifndef CONFIG_UDELAY_IO_DELAY -extern void io_delay_init(void); -#else -static inline void io_delay_init(void) -{ -} -#endif extern void native_io_delay(void); +extern int io_delay_type; +extern void io_delay_init(void); + static inline void slow_down_io(void) { native_io_delay(); |