diff --git a/[refs] b/[refs] index 19e281ef5460..d65ac1b46cf4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c977aad03a18019015035958c65b6729cd0574c +refs/heads/master: 21124a82bb82e100369846ff2044dd5ea65fc934 diff --git a/trunk/include/linux/compiler.h b/trunk/include/linux/compiler.h index 498c35920762..8287a72bb6a9 100644 --- a/trunk/include/linux/compiler.h +++ b/trunk/include/linux/compiler.h @@ -36,9 +36,7 @@ extern void __chk_io_ptr(const void __iomem *); #ifdef __KERNEL__ -#if __GNUC__ > 4 -#error no compiler-gcc.h file for this gcc version -#elif __GNUC__ == 4 +#if __GNUC__ >= 4 # include #elif __GNUC__ == 3 && __GNUC_MINOR__ >= 2 # include