aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-06-08 11:31:17 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-06-08 11:31:17 +0000
commit5ed3b31ce0bf83a163e642eeb19db9c30d2abd84 (patch)
tree1e9d1c2504c227bef9e65d84403380376ede46d7 /target/linux/generic-2.6
parente7cbce1f9e99ddf686bdef99574c0f62356b5a07 (diff)
downloadupstream-5ed3b31ce0bf83a163e642eeb19db9c30d2abd84.tar.gz
upstream-5ed3b31ce0bf83a163e642eeb19db9c30d2abd84.tar.bz2
upstream-5ed3b31ce0bf83a163e642eeb19db9c30d2abd84.zip
refresh 2.6.28 patches
SVN-Revision: 16377
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/208-rtl8110sb_fix.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches-2.6.28/208-rtl8110sb_fix.patch
index 9d9ae5023e..ca25aeda99 100644
--- a/target/linux/generic-2.6/patches-2.6.28/208-rtl8110sb_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/208-rtl8110sb_fix.patch
@@ -27,7 +27,7 @@
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
.features = RTL_FEATURE_MSI
-@@ -3555,10 +3555,12 @@ static irqreturn_t rtl8169_interrupt(int
+@@ -3554,10 +3554,12 @@ static irqreturn_t rtl8169_interrupt(int
goto out;
}
diff --git a/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch
index 023bf295e7..8168742eba 100644
--- a/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch
@@ -67,7 +67,7 @@
* macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c
+++ b/kernel/sched.c
-@@ -5064,6 +5064,7 @@ int can_nice(const struct task_struct *p
+@@ -5015,6 +5015,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
capable(CAP_SYS_NICE));
}