summaryrefslogtreecommitdiff
path: root/target/linux/generic
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-13 17:14:08 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-13 17:14:08 +0000
commitb1ca5c48268904293815970fd82e2723fd648fe8 (patch)
tree9abf34a6529ecbd2a89e444f480875e25ba76093 /target/linux/generic
parentdbf062aadfe81c54bfa147d21fe9ce83c5b7702b (diff)
kernel: update to kernel version 2.6.37.3
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26126 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-2.6.37/010-debloat_lzma.patch6
-rw-r--r--target/linux/generic/patches-2.6.37/281-solos_uniform_vpi_vci.patch6
-rw-r--r--target/linux/generic/patches-2.6.37/980-vm_exports.patch2
3 files changed, 6 insertions, 8 deletions
diff --git a/target/linux/generic/patches-2.6.37/010-debloat_lzma.patch b/target/linux/generic/patches-2.6.37/010-debloat_lzma.patch
index 18e4a51ee3..1e41661ebb 100644
--- a/target/linux/generic/patches-2.6.37/010-debloat_lzma.patch
+++ b/target/linux/generic/patches-2.6.37/010-debloat_lzma.patch
@@ -124,7 +124,7 @@
/* LzmaDecode
--- a/lib/lzma/LzmaDec.c
+++ b/lib/lzma/LzmaDec.c
-@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p,
+@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p,
p->needFlush = 0;
}
@@ -194,7 +194,7 @@
{
CLzmaProps propNew;
RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-@@ -944,7 +944,7 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p,
+@@ -944,7 +944,7 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p,
return SZ_OK;
}
@@ -375,7 +375,7 @@
void MatchFinder_Construct(CMatchFinder *p);
/* Conditions:
-@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p,
+@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p,
UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
ISzAlloc *alloc);
void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
diff --git a/target/linux/generic/patches-2.6.37/281-solos_uniform_vpi_vci.patch b/target/linux/generic/patches-2.6.37/281-solos_uniform_vpi_vci.patch
index 06d3f8c08c..a3a49bb31a 100644
--- a/target/linux/generic/patches-2.6.37/281-solos_uniform_vpi_vci.patch
+++ b/target/linux/generic/patches-2.6.37/281-solos_uniform_vpi_vci.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.37/drivers/atm/solos-pci.c
-===================================================================
---- linux-2.6.37.orig/drivers/atm/solos-pci.c 2011-03-05 21:46:26.136023697 +0100
-+++ linux-2.6.37/drivers/atm/solos-pci.c 2011-03-05 21:48:49.046598163 +0100
+--- a/drivers/atm/solos-pci.c
++++ b/drivers/atm/solos-pci.c
@@ -710,8 +710,8 @@ void solos_bh(unsigned long card_arg)
le16_to_cpu(header->vci));
if (!vcc) {
diff --git a/target/linux/generic/patches-2.6.37/980-vm_exports.patch b/target/linux/generic/patches-2.6.37/980-vm_exports.patch
index 8d8638be31..2a965b22fd 100644
--- a/target/linux/generic/patches-2.6.37/980-vm_exports.patch
+++ b/target/linux/generic/patches-2.6.37/980-vm_exports.patch
@@ -94,7 +94,7 @@
/**
* zap_vma_ptes - remove ptes mapping the vma
-@@ -2614,6 +2615,7 @@ int vmtruncate_range(struct inode *inode
+@@ -2616,6 +2617,7 @@ int vmtruncate_range(struct inode *inode
return 0;
}