diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-06-23 16:07:34 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-06-23 16:07:34 +0200 |
commit | 1240e6b5532358257c52351639a8d2382fe58f84 (patch) | |
tree | 43d374ce976a41c6dcd12a70a51e0289093f8d07 /scripts/Makefile.build | |
parent | ALSA: alsa: riptide: don't use own hex_to_bin() method (diff) | |
parent | ALSA: usb-audio - Add volume resolution quirk for some Logitech webcams (diff) | |
download | linux-1240e6b5532358257c52351639a8d2382fe58f84.tar.xz linux-1240e6b5532358257c52351639a8d2382fe58f84.zip |
Merge branch 'fix/misc' into topic/misc
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 |