[adm5120] fix flash driver fixes, call request_mem_region/ioremap_nocache with the...

[openwrt.git] / target / linux / generic-2.6 / patches / 200-sched_esfq.patch

diff --git a/target/linux/generic-2.6/patches/200-sched_esfq.patch b/target/linux/generic-2.6/patches/200-sched_esfq.patch
index dba20cf..ee43074 100644 (file)
--- a/target/linux/generic-2.6/patches/200-sched_esfq.patch
+++ b/target/linux/generic-2.6/patches/200-sched_esfq.patch
@@ -1,6 +1,6 @@
-diff -Naur linux-2.6.20.orig/include/linux/pkt_sched.h linux-2.6.20/include/linux/pkt_sched.h
---- linux-2.6.20.orig/include/linux/pkt_sched.h        2007-02-04 10:44:54.000000000 -0800
-+++ linux-2.6.20/include/linux/pkt_sched.h     2007-02-14 23:58:41.000000000 -0800
+diff -urN linux-2.6.21.1.old/include/linux/pkt_sched.h linux-2.6.21.1.dev/include/linux/pkt_sched.h
+--- linux-2.6.21.1.old/include/linux/pkt_sched.h       2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/include/linux/pkt_sched.h       2007-05-26 20:43:12.530587320 +0200

 @@ -146,8 +146,40 @@
   *
   *    The only reason for this is efficiency, it is possible
 @@ -146,8 +146,40 @@
   *
   *    The only reason for this is efficiency, it is possible


@@ -42,9 +42,9 @@ diff -Naur linux-2.6.20.orig/include/linux/pkt_sched.h linux-2.6.20/include/linu
  /* RED section */
  
  enum
  /* RED section */
  
  enum

-diff -Naur linux-2.6.20.orig/net/sched/Kconfig linux-2.6.20/net/sched/Kconfig
---- linux-2.6.20.orig/net/sched/Kconfig        2007-02-04 10:44:54.000000000 -0800
-+++ linux-2.6.20/net/sched/Kconfig     2007-02-14 23:58:41.000000000 -0800
+diff -urN linux-2.6.21.1.old/net/sched/Kconfig linux-2.6.21.1.dev/net/sched/Kconfig
+--- linux-2.6.21.1.old/net/sched/Kconfig       2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/net/sched/Kconfig       2007-05-26 20:43:12.572580936 +0200

 @@ -189,6 +189,26 @@
          To compile this code as a module, choose M here: the
          module will be called sch_sfq.
 @@ -189,6 +189,26 @@
          To compile this code as a module, choose M here: the
          module will be called sch_sfq.


@@ -72,10 +72,10 @@ diff -Naur linux-2.6.20.orig/net/sched/Kconfig linux-2.6.20/net/sched/Kconfig
  config NET_SCH_TEQL
        tristate "True Link Equalizer (TEQL)"
        ---help---
  config NET_SCH_TEQL
        tristate "True Link Equalizer (TEQL)"
        ---help---

-diff -Naur linux-2.6.20.orig/net/sched/Makefile linux-2.6.20/net/sched/Makefile
---- linux-2.6.20.orig/net/sched/Makefile       2007-02-04 10:44:54.000000000 -0800
-+++ linux-2.6.20/net/sched/Makefile    2007-02-14 23:58:41.000000000 -0800
-@@ -24,6 +24,7 @@
+diff -urN linux-2.6.21.1.old/net/sched/Makefile linux-2.6.21.1.dev/net/sched/Makefile
+--- linux-2.6.21.1.old/net/sched/Makefile      2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/net/sched/Makefile      2007-05-26 20:43:12.577580176 +0200
+@@ -23,6 +23,7 @@

  obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o 
  obj-$(CONFIG_NET_SCH_DSMARK)  += sch_dsmark.o
  obj-$(CONFIG_NET_SCH_SFQ)     += sch_sfq.o
  obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o 
  obj-$(CONFIG_NET_SCH_DSMARK)  += sch_dsmark.o
  obj-$(CONFIG_NET_SCH_SFQ)     += sch_sfq.o


@@ -83,9 +83,9 @@ diff -Naur linux-2.6.20.orig/net/sched/Makefile linux-2.6.20/net/sched/Makefile
  obj-$(CONFIG_NET_SCH_TBF)     += sch_tbf.o
  obj-$(CONFIG_NET_SCH_TEQL)    += sch_teql.o
  obj-$(CONFIG_NET_SCH_PRIO)    += sch_prio.o
  obj-$(CONFIG_NET_SCH_TBF)     += sch_tbf.o
  obj-$(CONFIG_NET_SCH_TEQL)    += sch_teql.o
  obj-$(CONFIG_NET_SCH_PRIO)    += sch_prio.o

-diff -Naur linux-2.6.20.orig/net/sched/sch_esfq.c linux-2.6.20/net/sched/sch_esfq.c
---- linux-2.6.20.orig/net/sched/sch_esfq.c     1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.20/net/sched/sch_esfq.c  2007-02-15 00:19:56.000000000 -0800
+diff -urN linux-2.6.21.1.old/net/sched/sch_esfq.c linux-2.6.21.1.dev/net/sched/sch_esfq.c
+--- linux-2.6.21.1.old/net/sched/sch_esfq.c    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.21.1.dev/net/sched/sch_esfq.c    2007-05-26 20:43:12.578580024 +0200

 @@ -0,0 +1,704 @@
 +/*
 + * net/sched/sch_esfq.c       Extended Stochastic Fairness Queueing discipline.
 @@ -0,0 +1,704 @@
 +/*
 + * net/sched/sch_esfq.c       Extended Stochastic Fairness Queueing discipline.