aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-02-17 15:09:59 -0500
committerJeff Garzik <jeff@garzik.org>2007-02-17 15:09:59 -0500
commit48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch)
treeda3aa535c98cc0957851354ceb0fbff7482d7a9d /Makefile
parent1a1689344add3333d28d1b5495d8043a3877d01c (diff)
parent4409d28140d9a6e6e3f4f1fdaf7234c4b965d954 (diff)
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index cdeda68cf2aa..7e4968fb2134 100644
--- a/Makefile
+++ b/Makefile
@@ -789,7 +789,7 @@ $(vmlinux-dirs): prepare scripts
789 789
790pattern = ".*/localversion[^~]*" 790pattern = ".*/localversion[^~]*"
791string = $(shell cat /dev/null \ 791string = $(shell cat /dev/null \
792 `find $(objtree) $(srctree) -maxdepth 1 -regex $(pattern) | sort`) 792 `find $(objtree) $(srctree) -maxdepth 1 -regex $(pattern) | sort -u`)
793 793
794localver = $(subst $(space),, $(string) \ 794localver = $(subst $(space),, $(string) \
795 $(patsubst "%",%,$(CONFIG_LOCALVERSION))) 795 $(patsubst "%",%,$(CONFIG_LOCALVERSION)))