diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-09-22 15:49:07 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-09-22 15:49:07 -0400 |
| commit | f49ec60b4d6394cf199837bbe4c10258e5a877c7 (patch) | |
| tree | ef3e5d7fa7140d9d5dcde98bae9cbba9c4a7767e /litmus/Makefile | |
| parent | 5bb94208c31339c352c2aca20f8450f8dd5a464e (diff) | |
| parent | 06b23f7b33c61cf1f03acb2d19ddf5dc6c57a810 (diff) | |
Merge branch 'wip-edffm' into wip-npsf-merge
Conflicts:
include/litmus/rt_param.h
litmus/Makefile
Diffstat (limited to 'litmus/Makefile')
| -rw-r--r-- | litmus/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/litmus/Makefile b/litmus/Makefile index fbd15ccf6423..89c22198a53a 100644 --- a/litmus/Makefile +++ b/litmus/Makefile | |||
| @@ -14,7 +14,8 @@ obj-y = sched_plugin.o litmus.o \ | |||
| 14 | ctrldev.o \ | 14 | ctrldev.o \ |
| 15 | sched_gsn_edf.o \ | 15 | sched_gsn_edf.o \ |
| 16 | sched_psn_edf.o \ | 16 | sched_psn_edf.o \ |
| 17 | sched_npsf.o | 17 | sched_npsf.o \ |
| 18 | sched_edf_fm.o | ||
| 18 | 19 | ||
| 19 | obj-$(CONFIG_PLUGIN_CEDF) += sched_cedf.o | 20 | obj-$(CONFIG_PLUGIN_CEDF) += sched_cedf.o |
| 20 | obj-$(CONFIG_PLUGIN_PFAIR) += sched_pfair.o | 21 | obj-$(CONFIG_PLUGIN_PFAIR) += sched_pfair.o |