From: Hauke Mehrtens Date: Wed, 13 Jan 2010 21:20:18 +0000 (+0100) Subject: compat: autoconf.h moved from linux/ to generated/ with kernel 2.6.33 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f384ddbe0435fb9cf159ec7135a8ee108d83749c;p=openwrt%2Fstaging%2Fblogic.git compat: autoconf.h moved from linux/ to generated/ with kernel 2.6.33 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 --- diff --git a/include/linux/compat-2.6.14.h b/include/linux/compat-2.6.14.h index 22e7e31948bb..1f19f7fee562 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 #include /* 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 3245c42c17e8..5e0182b18a16 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 #include /* 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 017044cf0031..1e648c0aeba6 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 #include /* 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 263ebd2fdc00..89ed6d9a4358 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 #include /* 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 85cd9d56d99c..7ca1b18ea0f3 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 #include /* 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 57b0642e8e0b..fbfb470d13bf 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 #include /* 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 7b16130048d8..f9c777cace1e 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 #include /* 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 7188b8c118dc..f62a096fd4a4 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 #include /* 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 96459e0b8517..360f8e02c5a4 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 #include #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 3e471d09de36..6d6bd8810dd8 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 #include #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 02297578ac6e..bc260860bfe0 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 #include #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 a1a956a38b1a..318cdf435ab5 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 #include #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 2ff1d6917e56..f997d8621927 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 #include #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 27dc6a1dbe45..54ddefdcd5a4 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 #include #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 727ac71d613e..c3e4dbec6570 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 #include #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 68f0e2ca79be..81239148af43 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 #include -#include #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 bea00c99a6a9..81224deb3ebe 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 #include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include +#endif #include /*