From c92885c466d11dc3b8e2837a8be1fd3b6b7e2e01 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 14 Dec 2006 16:41:33 +0000 Subject: Upgrade to Linux 2.6.19 - Includes large parts of the patch from #1021 by dpalffy - Includes RB532 NAND driver changes by n0-1 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5789 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ixp4xx-2.6/Makefile | 5 ++--- target/linux/ixp4xx-2.6/patches/100-npe_driver.patch | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'target/linux/ixp4xx-2.6') diff --git a/target/linux/ixp4xx-2.6/Makefile b/target/linux/ixp4xx-2.6/Makefile index 52d607d56..3c995bf79 100644 --- a/target/linux/ixp4xx-2.6/Makefile +++ b/target/linux/ixp4xx-2.6/Makefile @@ -14,10 +14,9 @@ FEATURES:=jffs2 define Target/Description endef - -LINUX_VERSION:=2.6.17 +LINUX_VERSION:=2.6.19 LINUX_RELEASE:=1 -LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e +LINUX_KERNEL_MD5SUM:=443c265b57e87eadc0c677c3acc37e20 include $(INCLUDE_DIR)/kernel-build.mk $(eval $(call BuildKernel)) diff --git a/target/linux/ixp4xx-2.6/patches/100-npe_driver.patch b/target/linux/ixp4xx-2.6/patches/100-npe_driver.patch index e65838f3c..0e13e1f7f 100644 --- a/target/linux/ixp4xx-2.6/patches/100-npe_driver.patch +++ b/target/linux/ixp4xx-2.6/patches/100-npe_driver.patch @@ -750,7 +750,7 @@ diff -Nur linux-2.6.17/drivers/net/ixp4xx/ixp4xx_qmgr.c linux-2.6.17-owrt/driver + return 0; +} + -+static irqreturn_t irq_qm1(int irq, void *dev_id, struct pt_regs *regs) ++static irqreturn_t irq_qm1(int irq, void *dev_id) +{ + struct qm_qmgr *qmgr = dev_id; + int offs, reg; -- cgit v1.2.3