Changed the headers, because autoconf.h moved from linux/ into generated/ All compat-2.6.XX.h files are included by compat-2.6.h, so only compat-2.6.h needs to include autoconf.h. There is no situation known to me where you want to include any compat-2.6.XX.h file directly. This fixes build with kernel 2.6.33, without it complains about a missing import: /include/linux/compat-2.6.h:4:28: error: linux/autoconf.h: No such file or directory Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx> --- include/linux/compat-2.6.14.h | 1 - include/linux/compat-2.6.18.h | 1 - include/linux/compat-2.6.19.h | 1 - include/linux/compat-2.6.21.h | 1 - include/linux/compat-2.6.22.h | 1 - include/linux/compat-2.6.23.h | 1 - include/linux/compat-2.6.24.h | 1 - include/linux/compat-2.6.25.h | 1 - include/linux/compat-2.6.26.h | 1 - include/linux/compat-2.6.27.h | 1 - include/linux/compat-2.6.28.h | 1 - include/linux/compat-2.6.29.h | 1 - include/linux/compat-2.6.30.h | 1 - include/linux/compat-2.6.31.h | 1 - include/linux/compat-2.6.32.h | 1 - include/linux/compat-2.6.33.h | 2 -- include/linux/compat-2.6.h | 6 +++++- 17 files changed, 5 insertions(+), 18 deletions(-) diff --git a/include/linux/compat-2.6.14.h b/include/linux/compat-2.6.14.h index 22e7e31..1f19f7f 100644 --- a/include/linux/compat-2.6.14.h +++ b/include/linux/compat-2.6.14.h @@ -1,7 +1,6 @@ #ifndef LINUX_26_14_COMPAT_H #define LINUX_26_14_COMPAT_H -#include <linux/autoconf.h> #include <linux/version.h> /* Compat work for 2.6.14 */ diff --git a/include/linux/compat-2.6.18.h b/include/linux/compat-2.6.18.h index 3245c42..5e0182b 100644 --- a/include/linux/compat-2.6.18.h +++ b/include/linux/compat-2.6.18.h @@ -1,7 +1,6 @@ #ifndef LINUX_26_18_COMPAT_H #define LINUX_26_18_COMPAT_H -#include <linux/autoconf.h> #include <linux/version.h> /* Compat work for 2.6.18 */ diff --git a/include/linux/compat-2.6.19.h b/include/linux/compat-2.6.19.h index 017044c..1e648c0 100644 --- a/include/linux/compat-2.6.19.h +++ b/include/linux/compat-2.6.19.h @@ -1,7 +1,6 @@ #ifndef LINUX_26_19_COMPAT_H #define LINUX_26_19_COMPAT_H -#include <linux/autoconf.h> #include <linux/version.h> /* Compat work for 2.6.19 */ diff --git a/include/linux/compat-2.6.21.h b/include/linux/compat-2.6.21.h index 263ebd2..89ed6d9 100644 --- a/include/linux/compat-2.6.21.h +++ b/include/linux/compat-2.6.21.h @@ -1,7 +1,6 @@ #ifndef LINUX_26_21_COMPAT_H #define LINUX_26_21_COMPAT_H -#include <linux/autoconf.h> #include <linux/version.h> /* Compat work for 2.6.21 */ diff --git a/include/linux/compat-2.6.22.h b/include/linux/compat-2.6.22.h index 85cd9d5..7ca1b18 100644 --- a/include/linux/compat-2.6.22.h +++ b/include/linux/compat-2.6.22.h @@ -1,7 +1,6 @@ #ifndef LINUX_26_22_COMPAT_H #define LINUX_26_22_COMPAT_H -#include <linux/autoconf.h> #include <linux/version.h> /* Compat work for 2.6.21 */ diff --git a/include/linux/compat-2.6.23.h b/include/linux/compat-2.6.23.h index 57b0642..fbfb470 100644 --- a/include/linux/compat-2.6.23.h +++ b/include/linux/compat-2.6.23.h @@ -1,7 +1,6 @@ #ifndef LINUX_26_23_COMPAT_H #define LINUX_26_23_COMPAT_H -#include <linux/autoconf.h> #include <linux/version.h> /* Compat work for < 2.6.23 */ diff --git a/include/linux/compat-2.6.24.h b/include/linux/compat-2.6.24.h index 7b16130..f9c777c 100644 --- a/include/linux/compat-2.6.24.h +++ b/include/linux/compat-2.6.24.h @@ -1,7 +1,6 @@ #ifndef LINUX_26_24_COMPAT_H #define LINUX_26_24_COMPAT_H -#include <linux/autoconf.h> #include <linux/version.h> /* Compat work for 2.6.21, 2.6.22 and 2.6.23 */ diff --git a/include/linux/compat-2.6.25.h b/include/linux/compat-2.6.25.h index 7188b8c..f62a096 100644 --- a/include/linux/compat-2.6.25.h +++ b/include/linux/compat-2.6.25.h @@ -1,7 +1,6 @@ #ifndef LINUX_26_25_COMPAT_H #define LINUX_26_25_COMPAT_H -#include <linux/autoconf.h> #include <linux/version.h> /* Compat work for 2.6.24 */ diff --git a/include/linux/compat-2.6.26.h b/include/linux/compat-2.6.26.h index 0ea99b1..779d545 100644 --- a/include/linux/compat-2.6.26.h +++ b/include/linux/compat-2.6.26.h @@ -1,7 +1,6 @@ #ifndef LINUX_26_26_COMPAT_H #define LINUX_26_26_COMPAT_H -#include <linux/autoconf.h> #include <linux/version.h> #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) diff --git a/include/linux/compat-2.6.27.h b/include/linux/compat-2.6.27.h index 3e471d0..6d6bd88 100644 --- a/include/linux/compat-2.6.27.h +++ b/include/linux/compat-2.6.27.h @@ -1,7 +1,6 @@ #ifndef LINUX_26_27_COMPAT_H #define LINUX_26_27_COMPAT_H -#include <linux/autoconf.h> #include <linux/version.h> #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)) diff --git a/include/linux/compat-2.6.28.h b/include/linux/compat-2.6.28.h index 0229757..bc26086 100644 --- a/include/linux/compat-2.6.28.h +++ b/include/linux/compat-2.6.28.h @@ -1,7 +1,6 @@ #ifndef LINUX_26_28_COMPAT_H #define LINUX_26_28_COMPAT_H -#include <linux/autoconf.h> #include <linux/version.h> #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)) diff --git a/include/linux/compat-2.6.29.h b/include/linux/compat-2.6.29.h index a1a956a..318cdf4 100644 --- a/include/linux/compat-2.6.29.h +++ b/include/linux/compat-2.6.29.h @@ -1,7 +1,6 @@ #ifndef LINUX_26_29_COMPAT_H #define LINUX_26_29_COMPAT_H -#include <linux/autoconf.h> #include <linux/version.h> #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) diff --git a/include/linux/compat-2.6.30.h b/include/linux/compat-2.6.30.h index 2ff1d69..f997d86 100644 --- a/include/linux/compat-2.6.30.h +++ b/include/linux/compat-2.6.30.h @@ -1,7 +1,6 @@ #ifndef LINUX_26_30_COMPAT_H #define LINUX_26_30_COMPAT_H -#include <linux/autoconf.h> #include <linux/version.h> #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) diff --git a/include/linux/compat-2.6.31.h b/include/linux/compat-2.6.31.h index 27dc6a1..54ddefd 100644 --- a/include/linux/compat-2.6.31.h +++ b/include/linux/compat-2.6.31.h @@ -1,7 +1,6 @@ #ifndef LINUX_26_31_COMPAT_H #define LINUX_26_31_COMPAT_H -#include <linux/autoconf.h> #include <linux/version.h> #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)) diff --git a/include/linux/compat-2.6.32.h b/include/linux/compat-2.6.32.h index 727ac71..c3e4dbe 100644 --- a/include/linux/compat-2.6.32.h +++ b/include/linux/compat-2.6.32.h @@ -1,7 +1,6 @@ #ifndef LINUX_26_32_COMPAT_H #define LINUX_26_32_COMPAT_H -#include <linux/autoconf.h> #include <linux/version.h> #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)) diff --git a/include/linux/compat-2.6.33.h b/include/linux/compat-2.6.33.h index 68f0e2c..8123914 100644 --- a/include/linux/compat-2.6.33.h +++ b/include/linux/compat-2.6.33.h @@ -1,9 +1,7 @@ #ifndef LINUX_26_33_COMPAT_H #define LINUX_26_33_COMPAT_H -#include <linux/autoconf.h> #include <linux/version.h> -#include <linux/compat_autoconf.h> #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)) diff --git a/include/linux/compat-2.6.h b/include/linux/compat-2.6.h index bea00c9..81224de 100644 --- a/include/linux/compat-2.6.h +++ b/include/linux/compat-2.6.h @@ -1,8 +1,12 @@ #ifndef LINUX_26_COMPAT_H #define LINUX_26_COMPAT_H -#include <linux/autoconf.h> #include <linux/version.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include <generated/autoconf.h> +#else +#include <linux/autoconf.h> +#endif #include <linux/compat_autoconf.h> /* -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
