diff options
author | David S. Miller <davem@davemloft.net> | 2010-06-26 19:27:00 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-26 19:27:00 +0200 |
commit | c67dda14389205f0a223c5089307495290939b3b (patch) | |
tree | fad0bb26b28703d02a22ebdd44d94eabac4a2ade /scripts/Makefile.build | |
parent | sparc64: fix the build error due to smp_kgdb_capture_client() (diff) | |
parent | Linux 2.6.35-rc3 (diff) | |
download | linux-c67dda14389205f0a223c5089307495290939b3b.tar.xz linux-c67dda14389205f0a223c5089307495290939b3b.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'scripts/Makefile.build')
-rw-r--r-- | scripts/Makefile.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 0b94d2fa3a88..e4deb73e9a84 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -82,7 +82,7 @@ ifneq ($(strip $(lib-y) $(lib-m) $(lib-n) $(lib-)),) lib-target := $(obj)/lib.a endif -ifneq ($(strip $(obj-y) $(obj-m) $(obj-n) $(obj-) $(lib-target)),) +ifneq ($(strip $(obj-y) $(obj-m) $(obj-n) $(obj-) $(subdir-m) $(lib-target)),) builtin-target := $(obj)/built-in.o endif |