diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-12-14 16:41:33 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-12-14 16:41:33 +0000 |
| commit | bff468813f78f81e36ebb2a3f4354de7365e640f (patch) | |
| tree | e0144a8d723cac2fd84505ec140dd0011541430a /target/linux/ixp4xx-2.6 | |
| parent | 7ca328b65927e12b4bb65a6d752f43b674498908 (diff) | |
| download | upstream-bff468813f78f81e36ebb2a3f4354de7365e640f.tar.gz upstream-bff468813f78f81e36ebb2a3f4354de7365e640f.tar.bz2 upstream-bff468813f78f81e36ebb2a3f4354de7365e640f.zip | |
Upgrade to Linux 2.6.19
- Includes large parts of the patch from #1021 by dpalffy
- Includes RB532 NAND driver changes by n0-1
SVN-Revision: 5789
Diffstat (limited to 'target/linux/ixp4xx-2.6')
| -rw-r--r-- | target/linux/ixp4xx-2.6/Makefile | 5 | ||||
| -rw-r--r-- | target/linux/ixp4xx-2.6/patches/100-npe_driver.patch | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/target/linux/ixp4xx-2.6/Makefile b/target/linux/ixp4xx-2.6/Makefile index 52d607d566..3c995bf79a 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 e65838f3c2..0e13e1f7fb 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; |