kernel headers: bump 2.6.25.x

Based on patch by Fathi Boudra.

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 5b51b6e2cf1405a918870fd1f9db76eb733646f2..b6c25b39dd9284130efbfcae04c026200c25a91d 100644 (file)
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -137,6 +137,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
        default "2.6.22.10"     if BR2_KERNEL_HEADERS_2_6_22
        default "2.6.23"        if BR2_KERNEL_HEADERS_2_6_23
        default "2.6.24.7"      if BR2_KERNEL_HEADERS_2_6_24
-       default "2.6.25.6"      if BR2_KERNEL_HEADERS_2_6_25
+       default "2.6.25.9"      if BR2_KERNEL_HEADERS_2_6_25
        default "2.6"           if BR2_KERNEL_HEADERS_SNAP
 

diff --git a/toolchain/kernel-headers/linux-2.6.25.6-export-linux-aout.patch b/toolchain/kernel-headers/linux-2.6.25.6-export-linux-aout.patch
deleted file mode 100644 (file)
index 972fa76..0000000
--- a/toolchain/kernel-headers/linux-2.6.25.6-export-linux-aout.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-[PATCH] export linux/a.out.h
-
-Export linux/a.out.h like we do for asm/a.out.h. One minor complication is
-that the interesting stuff is protected by an CONFIG_ARCH_SUPPORTS_AOUT ifdef,
-so make sure this gets defined for unifdef.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- include/linux/Kbuild |    2 ++
- 1 file changed, 2 insertions(+)
-
-Index: linux-2.6.25.6/include/linux/Kbuild
-===================================================================
---- linux-2.6.25.6.orig/include/linux/Kbuild
-+++ linux-2.6.25.6/include/linux/Kbuild
-@@ -159,6 +159,8 @@
- header-y += videotext.h
- header-y += x25.h
- 
-+UNIFDEF += -DCONFIG_ARCH_SUPPORTS_AOUT
-+unifdef-y += a.out.h
- unifdef-y += acct.h
- unifdef-y += adb.h
- unifdef-y += adfs_fs.h

diff --git a/toolchain/kernel-headers/linux-2.6.25.9-export-linux-aout.patch b/toolchain/kernel-headers/linux-2.6.25.9-export-linux-aout.patch
new file mode 100644 (file)
index 0000000..972fa76
--- /dev/null
+++ b/toolchain/kernel-headers/linux-2.6.25.9-export-linux-aout.patch
@@ -0,0 +1,24 @@
+[PATCH] export linux/a.out.h
+
+Export linux/a.out.h like we do for asm/a.out.h. One minor complication is
+that the interesting stuff is protected by an CONFIG_ARCH_SUPPORTS_AOUT ifdef,
+so make sure this gets defined for unifdef.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ include/linux/Kbuild |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: linux-2.6.25.6/include/linux/Kbuild
+===================================================================
+--- linux-2.6.25.6.orig/include/linux/Kbuild
++++ linux-2.6.25.6/include/linux/Kbuild
+@@ -159,6 +159,8 @@
+ header-y += videotext.h
+ header-y += x25.h
+ 
++UNIFDEF += -DCONFIG_ARCH_SUPPORTS_AOUT
++unifdef-y += a.out.h
+ unifdef-y += acct.h
+ unifdef-y += adb.h
+ unifdef-y += adfs_fs.h