diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
| commit | e049d1ca3094f3d1d94617f456a9961202f96e3a (patch) | |
| tree | a30397ad22f2fbea268bd28fa69c60aad9dfa62a /net/sched/Makefile | |
| parent | edfac96a92b88d3b0b53e3f8231b74beee9ecd1d (diff) | |
| parent | 80584ff3b99c36ead7e130e453b3a48b18072d18 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'net/sched/Makefile')
| -rw-r--r-- | net/sched/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/sched/Makefile b/net/sched/Makefile index ff2d6e5e282c..020767a204d4 100644 --- a/net/sched/Makefile +++ b/net/sched/Makefile | |||
| @@ -17,7 +17,6 @@ obj-$(CONFIG_NET_ACT_SIMP) += act_simple.o | |||
| 17 | obj-$(CONFIG_NET_SCH_FIFO) += sch_fifo.o | 17 | obj-$(CONFIG_NET_SCH_FIFO) += sch_fifo.o |
| 18 | obj-$(CONFIG_NET_SCH_CBQ) += sch_cbq.o | 18 | obj-$(CONFIG_NET_SCH_CBQ) += sch_cbq.o |
| 19 | obj-$(CONFIG_NET_SCH_HTB) += sch_htb.o | 19 | obj-$(CONFIG_NET_SCH_HTB) += sch_htb.o |
| 20 | obj-$(CONFIG_NET_SCH_HPFQ) += sch_hpfq.o | ||
| 21 | obj-$(CONFIG_NET_SCH_HFSC) += sch_hfsc.o | 20 | obj-$(CONFIG_NET_SCH_HFSC) += sch_hfsc.o |
| 22 | obj-$(CONFIG_NET_SCH_RED) += sch_red.o | 21 | obj-$(CONFIG_NET_SCH_RED) += sch_red.o |
| 23 | obj-$(CONFIG_NET_SCH_GRED) += sch_gred.o | 22 | obj-$(CONFIG_NET_SCH_GRED) += sch_gred.o |