diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /scripts/Makefile.modpost | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.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 |