X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-x86_64%2Fio.h;h=70e91fe7634485708815dda0c851c2f066064a1c;hb=467c432a4d63349025d92f5dbdd0b9ba8ff40fd5;hp=cafdfb37f0d8a6db30c5ada019fe52747b880b8b;hpb=53846a21c1766326bb14ce8ab6e997a0c120675d;p=linux-2.6

diff --git a/include/asm-x86_64/io.h b/include/asm-x86_64/io.h
index cafdfb37f0..70e91fe763 100644
--- a/include/asm-x86_64/io.h
+++ b/include/asm-x86_64/io.h
@@ -1,7 +1,6 @@
 #ifndef _ASM_IO_H
 #define _ASM_IO_H
 
-#include <linux/config.h>
 
 /*
  * This file contains the definitions for the x86 IO instructions
@@ -177,7 +176,7 @@ static inline __u16 __readw(const volatile void __iomem *addr)
 {
 	return *(__force volatile __u16 *)addr;
 }
-static inline __u32 __readl(const volatile void __iomem *addr)
+static __always_inline __u32 __readl(const volatile void __iomem *addr)
 {
 	return *(__force volatile __u32 *)addr;
 }