diff --git a/[refs] b/[refs] index 19dc17209041..542686296be6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad4e680fb2220518de5118a8e734240d4c374fe2 +refs/heads/master: b0957f1a3a7687bfaf5b0bfe402b50985ea2f06b diff --git a/trunk/include/asm-x86_64/io.h b/trunk/include/asm-x86_64/io.h index f5d84bb7c948..de2cd9a2303a 100644 --- a/trunk/include/asm-x86_64/io.h +++ b/trunk/include/asm-x86_64/io.h @@ -100,7 +100,7 @@ __OUTS(l) #define IO_SPACE_LIMIT 0xffff -#if defined(__KERNEL__) && __x86_64__ +#if defined(__KERNEL__) && defined(__x86_64__) #include