aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/kernel-version.mk4
-rw-r--r--target/linux/adm5120/Makefile2
-rw-r--r--target/linux/ar7/Makefile2
-rw-r--r--target/linux/au1000/Makefile2
-rw-r--r--target/linux/avr32/Makefile2
-rw-r--r--target/linux/brcm63xx/Makefile2
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch17
-rw-r--r--target/linux/iop32x/Makefile2
-rw-r--r--target/linux/ixp4xx/Makefile2
-rw-r--r--target/linux/magicbox/Makefile2
-rw-r--r--target/linux/ppc40x/Makefile2
-rw-r--r--target/linux/ppc44x/Makefile2
-rw-r--r--target/linux/rdc/Makefile2
-rw-r--r--target/linux/sibyte/Makefile2
-rw-r--r--target/linux/uml/Makefile2
-rw-r--r--target/linux/x86/Makefile2
16 files changed, 17 insertions, 32 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 71e4f12837..de07e90ced 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -22,8 +22,8 @@ endif
ifeq ($(LINUX_VERSION),2.6.23.16)
LINUX_KERNEL_MD5SUM:=2637a7f1d4450bc5e27422f307fc6529
endif
-ifeq ($(LINUX_VERSION),2.6.24.2)
- LINUX_KERNEL_MD5SUM:=dd573a2fae55624ed92fa49c17583964
+ifeq ($(LINUX_VERSION),2.6.24.5)
+ LINUX_KERNEL_MD5SUM:=26500f8f92895bd33e391088b5edd4ad
endif
ifeq ($(LINUX_VERSION),2.6.25)
LINUX_KERNEL_MD5SUM:=db95a49a656a3247d4995a797d333153
diff --git a/target/linux/adm5120/Makefile b/target/linux/adm5120/Makefile
index a397f2a26f..4cc10ef620 100644
--- a/target/linux/adm5120/Makefile
+++ b/target/linux/adm5120/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
BOARD:=adm5120
BOARDNAME:=Infineon ADM5120
-LINUX_VERSION:=2.6.24.2
+LINUX_VERSION:=2.6.24.5
SUBTARGETS:=router_le router_be
INITRAMFS_EXTRA_FILES:=
diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile
index fc83f9a050..5ce6e630ef 100644
--- a/target/linux/ar7/Makefile
+++ b/target/linux/ar7/Makefile
@@ -11,7 +11,7 @@ BOARD:=ar7
BOARDNAME:=TI AR7
FEATURES:=squashfs jffs2 atm
-LINUX_VERSION:=2.6.24.2
+LINUX_VERSION:=2.6.24.5
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile
index 4566d6c4cb..3b16c4259e 100644
--- a/target/linux/au1000/Makefile
+++ b/target/linux/au1000/Makefile
@@ -11,7 +11,7 @@ BOARD:=au1000
BOARDNAME:=AMD Alchemy AU1x00
FEATURES:=jffs2 usb pci
-LINUX_VERSION:=2.6.24.2
+LINUX_VERSION:=2.6.24.5
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += yamonenv
diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile
index 4b492845bc..ec1a959ed2 100644
--- a/target/linux/avr32/Makefile
+++ b/target/linux/avr32/Makefile
@@ -10,7 +10,7 @@ ARCH:=avr32
BOARD:=avr32
BOARDNAME:=Atmel AVR32
FEATURES:=squashfs
-LINUX_VERSION:=2.6.24.2
+LINUX_VERSION:=2.6.24.5
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile
index 4e56dd72f2..457a67e6f3 100644
--- a/target/linux/brcm63xx/Makefile
+++ b/target/linux/brcm63xx/Makefile
@@ -10,7 +10,7 @@ ARCH:=mips
BOARD:=brcm63xx
BOARDNAME:=Broadcom BCM963xx
FEATURES:=squashfs jffs2 broken usb atm
-LINUX_VERSION:=2.6.24.2
+LINUX_VERSION:=2.6.24.5
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch b/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch
index 2aff3a7aeb..d31c2bb803 100644
--- a/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch
@@ -49955,21 +49955,6 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/chrp/pci.c p
/* keep the reference to the root node */
}
-@@ -354,7 +354,7 @@
- * mode as well. The same fixup must be done to the class-code property in
- * the IDE node /pci@80000000/ide@C,1
- */
--static void __devinit chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)
-+static void chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)
- {
- u8 progif;
- struct pci_dev *viaisa;
-@@ -375,4 +375,4 @@
-
- pci_dev_put(viaisa);
- }
--DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, chrp_pci_fixup_vt8231_ata);
-+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, chrp_pci_fixup_vt8231_ata);
diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/chrp/setup.c powerpc.git/arch/powerpc/platforms/chrp/setup.c
--- linux-2.6.24/arch/powerpc/platforms/chrp/setup.c 2008-01-24 23:58:37.000000000 +0100
+++ powerpc.git/arch/powerpc/platforms/chrp/setup.c 2008-01-28 20:25:49.000000000 +0100
@@ -64602,7 +64587,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
EXPORT_SYMBOL(pmu_suspend);
EXPORT_SYMBOL(pmu_resume);
EXPORT_SYMBOL(pmu_unlock);
--#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
+-#if defined(CONFIG_PPC32)
+#if defined(CONFIG_SUSPEND) && defined(CONFIG_PPC32)
EXPORT_SYMBOL(pmu_enable_irled);
EXPORT_SYMBOL(pmu_battery_count);
diff --git a/target/linux/iop32x/Makefile b/target/linux/iop32x/Makefile
index 82a3367a6a..41265ef9ff 100644
--- a/target/linux/iop32x/Makefile
+++ b/target/linux/iop32x/Makefile
@@ -11,7 +11,7 @@ BOARD:=iop32x
BOARDNAME:=Intel XScale IOP32x
FEATURES:=squashfs jffs2
-LINUX_VERSION:=2.6.24.2
+LINUX_VERSION:=2.6.24.5
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile
index f6e9d47eee..83dc1ddec3 100644
--- a/target/linux/ixp4xx/Makefile
+++ b/target/linux/ixp4xx/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Intel XScale IXP4xx
FEATURES:=squashfs
SUBTARGETS=generic harddisk
-LINUX_VERSION:=2.6.24.2
+LINUX_VERSION:=2.6.24.5
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/magicbox/Makefile b/target/linux/magicbox/Makefile
index c03093e00e..548b960c1b 100644
--- a/target/linux/magicbox/Makefile
+++ b/target/linux/magicbox/Makefile
@@ -11,7 +11,7 @@ BOARD:=magicbox
BOARDNAME:=Magicbox
FEATURES:=squashfs pci
-LINUX_VERSION:=2.6.24.2
+LINUX_VERSION:=2.6.24.5
LINUX_KARCH:=ppc
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile
index b081849db8..2fdc1b0db9 100644
--- a/target/linux/ppc40x/Makefile
+++ b/target/linux/ppc40x/Makefile
@@ -11,7 +11,7 @@ BOARD:=ppc40x
BOARDNAME:=AMCC Kilauea
FEATURES:=squashfs
-LINUX_VERSION:=2.6.24.2
+LINUX_VERSION:=2.6.24.5
LINUX_KARCH:=powerpc
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile
index 7e7061265b..0a5fd35312 100644
--- a/target/linux/ppc44x/Makefile
+++ b/target/linux/ppc44x/Makefile
@@ -11,7 +11,7 @@ BOARD:=ppc44x
BOARDNAME:=AMCC Taishan
FEATURES:=squashfs
-LINUX_VERSION:=2.6.24.2
+LINUX_VERSION:=2.6.24.5
LINUX_KARCH:=powerpc
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/rdc/Makefile b/target/linux/rdc/Makefile
index 4e83e163d7..d840a42850 100644
--- a/target/linux/rdc/Makefile
+++ b/target/linux/rdc/Makefile
@@ -11,7 +11,7 @@ BOARD:=rdc
BOARDNAME:=RDC321x x86
FEATURES:=squashfs jffs2 pci
-LINUX_VERSION:=2.6.24.2
+LINUX_VERSION:=2.6.24.5
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/sibyte/Makefile b/target/linux/sibyte/Makefile
index dfc863222d..df4539ca93 100644
--- a/target/linux/sibyte/Makefile
+++ b/target/linux/sibyte/Makefile
@@ -11,7 +11,7 @@ BOARD:=sibyte
BOARDNAME:=Broadcom/SiByte SB-1
FEATURES:=broken
-LINUX_VERSION:=2.6.24.2
+LINUX_VERSION:=2.6.24.5
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile
index ebcfbbc99a..543f7036e2 100644
--- a/target/linux/uml/Makefile
+++ b/target/linux/uml/Makefile
@@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux
FEATURES:=broken ext2
LINUX_CONFIG:=$(CURDIR)/config/$(ARCH)
-LINUX_VERSION:=2.6.24.2
+LINUX_VERSION:=2.6.24.5
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index 4a7cdd615f..4663c3d5aa 100644
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=x86
FEATURES:=squashfs jffs2 ext2
SUBTARGETS=generic mediacenter
-LINUX_VERSION:=2.6.24.2
+LINUX_VERSION:=2.6.24.5
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci