diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-03-11 14:48:09 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-03-11 14:48:09 +0100 |
commit | cc99a0861fa1c72335dc91a2e06d0b431911d55e (patch) | |
tree | b5bba9600470f8a5e417519b7c2d5fd13d079c3b /sound/oss | |
parent | ALSA: usb-audio - Add "cval->res = 384" quirk for Logitech Webcam C600 (diff) | |
parent | ALSA: usb-audio: fix oops due to cleanup race when disconnecting (diff) | |
download | linux-cc99a0861fa1c72335dc91a2e06d0b431911d55e.tar.xz linux-cc99a0861fa1c72335dc91a2e06d0b431911d55e.zip |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/oss')
-rw-r--r-- | sound/oss/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/Makefile b/sound/oss/Makefile index 96f14dcd0cd1..90ffb99c6b17 100644 --- a/sound/oss/Makefile +++ b/sound/oss/Makefile @@ -87,7 +87,7 @@ ifeq ($(CONFIG_PSS_HAVE_BOOT),y) $(obj)/bin2hex pss_synth < $< > $@ else $(obj)/pss_boot.h: - ( \ + $(Q)( \ echo 'static unsigned char * pss_synth = NULL;'; \ echo 'static int pss_synthLen = 0;'; \ ) > $@ @@ -102,7 +102,7 @@ ifeq ($(CONFIG_TRIX_HAVE_BOOT),y) $(obj)/hex2hex -i trix_boot < $< > $@ else $(obj)/trix_boot.h: - ( \ + $(Q)( \ echo 'static unsigned char * trix_boot = NULL;'; \ echo 'static int trix_boot_len = 0;'; \ ) > $@ |