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 <hauke@hauke-m.de>

diff --git a/include/linux/compat-2.6.14.h b/include/linux/compat-2.6.14.h
index 22e7e31948bb97b9de4997d095c9015633e77306..1f19f7fee562616cbb971bba7eac9ba5ffaeba4d 100644 (file)
--- 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 3245c42c17e832cda9c46be90f284dac00b23199..5e0182b18a1648c5dfbfa13cc09bfd50d2c28d24 100644 (file)
--- 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 017044cf0031cb1120fc6eb162cb2c5a69f9d138..1e648c0aeba6997081b9145ba95346dbd6f68f72 100644 (file)
--- 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 263ebd2fdc00b4d4a2919e07797e17ab82c2f619..89ed6d9a435829fdef62df68a5a361c102b47151 100644 (file)
--- 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 85cd9d56d99c2f8a8d322c914b8a002b6f9305bb..7ca1b18ea0f3f76b76d90829e2ca078f0641b037 100644 (file)
--- 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 57b0642e8e0bf926a8bf005806925396624b0d37..fbfb470d13bf451437266f42c430e6e53f80b061 100644 (file)
--- 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 7b16130048d854f41bb20f80324e8f49e290ab11..f9c777cace1e333ce2f9a388415d62ddc16cc23c 100644 (file)
--- 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 7188b8c118dcdff9f7f8d864e2c3315556b3768c..f62a096fd4a472070d5ac8ad048fd4855d569b55 100644 (file)
--- 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 96459e0b8517c4bdf641f866689a8656c7fd7f0a..360f8e02c5a4302a44f0a1daaecde47e2066c38f 100644 (file)
--- 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 3e471d09de36ec579951cdb51f859ea437041fcb..6d6bd8810dd818f691ac3abe36670e525be3fe73 100644 (file)
--- 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 02297578ac6e2f1502b789144f830a2b01affc8f..bc260860bfe0d4b2a7b7200d1a883f53d3fde23d 100644 (file)
--- 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 a1a956a38b1ad96584b9a89f98500961b8dc317e..318cdf435ab59fd51665c4e4cc0b69f48cc0b25a 100644 (file)
--- 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 2ff1d6917e567e5eb6f029ac5bb8c89613c258f2..f997d8621927808dcc8ef005b40edc242de8cd94 100644 (file)
--- 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 27dc6a1dbe45d6f13e359bc6faf5318c81ad631b..54ddefdcd5a407fe00de53e090a4e17e1c97f0fd 100644 (file)
--- 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 727ac71d613eb549b544fc2584612fa104676e37..c3e4dbec6570fe636b85aef83656c0a4b1aec209 100644 (file)
--- 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 68f0e2ca79be1c3ce2f0d7871371e2f31ea76938..81239148af43aca6ffb7cf176316e51c50685c55 100644 (file)
--- 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 bea00c99a6a9d567a9dbc15596d4e5142a414040..81224deb3ebed4895efb360fbd8e024e69e7e4a8 100644 (file)
--- 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>
 
 /*