aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-08-22 15:37:19 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-08-22 15:37:19 +0000
commit80b1408ef97a63e0d1e3977cefecd00f9c085959 (patch)
tree074f7229f0cedb176a1a09354cbf032ed532b025 /target/linux/adm5120
parent54bcffc5e08f2cad6854dbdfaa05d597d1df0a8b (diff)
downloadmaster-187ad058-80b1408ef97a63e0d1e3977cefecd00f9c085959.tar.gz
master-187ad058-80b1408ef97a63e0d1e3977cefecd00f9c085959.tar.bz2
master-187ad058-80b1408ef97a63e0d1e3977cefecd00f9c085959.zip
[kernel] update to 2.6.26.3 and 2.6.25.16
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12371 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120')
-rw-r--r--target/linux/adm5120/Makefile4
-rw-r--r--target/linux/adm5120/patches-2.6.26/202-pci_disable_common_quirks.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/adm5120/Makefile b/target/linux/adm5120/Makefile
index f87f9eaf80..2947308f8e 100644
--- a/target/linux/adm5120/Makefile
+++ b/target/linux/adm5120/Makefile
@@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk
BOARD:=adm5120
BOARDNAME:=Infineon/ADMtek ADM5120
-#LINUX_VERSION:=2.6.25.15
-LINUX_VERSION:=2.6.26.2
+#LINUX_VERSION:=2.6.25.16
+LINUX_VERSION:=2.6.26.3
SUBTARGETS:=router_le router_be
INITRAMFS_EXTRA_FILES:=
diff --git a/target/linux/adm5120/patches-2.6.26/202-pci_disable_common_quirks.patch b/target/linux/adm5120/patches-2.6.26/202-pci_disable_common_quirks.patch
index 7f31c9bf94..40728a9707 100644
--- a/target/linux/adm5120/patches-2.6.26/202-pci_disable_common_quirks.patch
+++ b/target/linux/adm5120/patches-2.6.26/202-pci_disable_common_quirks.patch
@@ -39,7 +39,7 @@
/* Enable 1k I/O space granularity on the Intel P64H2 */
static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
{
-@@ -1929,3 +1932,4 @@
+@@ -1934,3 +1937,4 @@
quirk_msi_intx_disable_bug);
#endif /* CONFIG_PCI_MSI */