diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 10:05:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 10:05:02 -0400 |
| commit | b14db7abe3501524fd2b1b4ab328239cde42f567 (patch) | |
| tree | 21c57dd8b05a4db3dcdff2b1d62049e0bdb43aaf /Makefile | |
| parent | 02c646ef4e9040aa538fa6ed22bb3fb502df5a77 (diff) | |
| parent | d5eda75f3a6a08f5a3644764a88d288e62e7823d (diff) | |
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 | |||
| 944 | localver-extra = $(scm-identifier) | 944 | localver-extra = $(scm-identifier) |
| 945 | else | 945 | else |
| 946 | ifneq ($(scm-identifier),) | 946 | ifneq ($(scm-identifier),) |
| 947 | ifeq ($(LOCALVERSION),) | 947 | ifeq ("$(origin LOCALVERSION)", "undefined") |
| 948 | localver-extra = + | 948 | localver-extra = + |
| 949 | endif | 949 | endif |
| 950 | endif | 950 | endif |