diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2010-06-27 07:05:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2010-06-27 07:05:02 -0700 |
| commit | b14db7abe3501524fd2b1b4ab328239cde42f567 (patch) | |
| tree | 21c57dd8b05a4db3dcdff2b1d62049e0bdb43aaf /Makefile | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/... (diff) | |
| parent | kbuild: fix LOCALVERSION handling to match description (diff) | |
| download | linux-b14db7abe3501524fd2b1b4ab328239cde42f567.tar.gz linux-b14db7abe3501524fd2b1b4ab328239cde42f567.tar.bz2 linux-b14db7abe3501524fd2b1b4ab328239cde42f567.zip | |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
kbuild: fix LOCALVERSION handling to match description
kbuild: Fix modpost segfault
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -944,7 +944,7 @@ ifdef CONFIG_LOCALVERSION_AUTO localver-extra = $(scm-identifier) else ifneq ($(scm-identifier),) - ifeq ($(LOCALVERSION),) + ifeq ("$(origin LOCALVERSION)", "undefined") localver-extra = + endif endif |