diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /scripts/Makefile.modpost | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'scripts/Makefile.modpost')
| -rw-r--r-- | scripts/Makefile.modpost | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 7d22056582c1..56dfafc73c1a 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost | |||
| @@ -35,14 +35,14 @@ | |||
| 35 | # KBUILD_MODPOST_WARN can be set to avoid error out in case of undefined | 35 | # KBUILD_MODPOST_WARN can be set to avoid error out in case of undefined |
| 36 | # symbols in the final module linking stage | 36 | # symbols in the final module linking stage |
| 37 | # KBUILD_MODPOST_NOFINAL can be set to skip the final link of modules. | 37 | # KBUILD_MODPOST_NOFINAL can be set to skip the final link of modules. |
| 38 | # This is solely usefull to speed up test compiles | 38 | # This is solely useful to speed up test compiles |
| 39 | PHONY := _modpost | 39 | PHONY := _modpost |
| 40 | _modpost: __modpost | 40 | _modpost: __modpost |
| 41 | 41 | ||
| 42 | include include/config/auto.conf | 42 | include include/config/auto.conf |
| 43 | include scripts/Kbuild.include | 43 | include scripts/Kbuild.include |
| 44 | 44 | ||
| 45 | # When building external modules load the Kbuild file to retreive EXTRA_SYMBOLS info | 45 | # When building external modules load the Kbuild file to retrieve EXTRA_SYMBOLS info |
| 46 | ifneq ($(KBUILD_EXTMOD),) | 46 | ifneq ($(KBUILD_EXTMOD),) |
| 47 | 47 | ||
| 48 | # set src + obj - they may be used when building the .mod.c file | 48 | # set src + obj - they may be used when building the .mod.c file |
