kernel-power v42 -> kernel-bfs

[kernel-bfs] / kernel-bfs-2.6.28 / debian / patches / strip_cfs_nokia_pr13.diff

diff --git a/kernel-bfs-2.6.28/debian/patches/strip_cfs_nokia_pr13.diff b/kernel-bfs-2.6.28/debian/patches/strip_cfs_nokia_pr13.diff
index 983805a..71d1d65 100644 (file)
--- a/kernel-bfs-2.6.28/debian/patches/strip_cfs_nokia_pr13.diff
+++ b/kernel-bfs-2.6.28/debian/patches/strip_cfs_nokia_pr13.diff
@@ -1,9 +1,9 @@
---- kernel-2.6.28.orig/debian/patches/nokia-20103103+0m5.diff  2010-11-09 22:25:45.000000000 +0100
-+++ kernel-2.6.28/debian/patches/nokia-20103103+0m5.diff       2010-11-09 23:26:15.586667441 +0100
-@@ -1174,21 +1174,6 @@
-       check_charger = 0;
+--- kernel-2.6.28.orig/debian/patches/nokia-20103103+0m5.diff  2010-11-10 00:55:39.000000000 +0100
++++ kernel-2.6.28/debian/patches/nokia-20103103+0m5.diff       2010-11-10 01:07:22.996667558 +0100
+@@ -1131,21 +1131,6 @@
+       }
   
-       return vdat;
+       wl1251_debug(DEBUG_BOOT, "tx %s cmd channel %d",
 ---- kernel-power-2.6.28.orig/include/linux/sched.h
 -+++ kernel-power-2.6.28/include/linux/sched.h
 -@@ -1665,11 +1665,11 @@
@@ -22,12 +22,10 @@
  --- kernel-power-2.6.28.orig/include/linux/swap.h
  +++ kernel-power-2.6.28/include/linux/swap.h
  @@ -130,6 +130,17 @@
-@@ -1230,53 +1215,6 @@
-  #define SCO_DISCONN_TIMEOUT  (HZ * 2)
-  #define SCO_CONN_IDLE_TIMEOUT        (HZ * 60)
+@@ -1189,51 +1174,7 @@
   
----- kernel-power-2.6.28.orig/kernel/sched_fair.c
--+++ kernel-power-2.6.28/kernel/sched_fair.c
+ --- kernel-power-2.6.28.orig/kernel/sched_fair.c
+ +++ kernel-power-2.6.28/kernel/sched_fair.c
 -@@ -48,10 +48,10 @@
 - static unsigned int sched_nr_latency = 5;
 - 
@@ -73,6 +71,7 @@
 -              .procname       = "sched_features",
 -              .data           = &sysctl_sched_features,
 -              .maxlen         = sizeof(unsigned int),
++
  --- kernel-power-2.6.28.orig/mm/swapfile.c
  +++ kernel-power-2.6.28/mm/swapfile.c
  @@ -996,11 +996,55 @@