diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-11 08:48:09 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-11 08:48:09 -0500 |
| commit | cc99a0861fa1c72335dc91a2e06d0b431911d55e (patch) | |
| tree | b5bba9600470f8a5e417519b7c2d5fd13d079c3b /sound/oss | |
| parent | bc3a8a01def4fb0ec0ef8a20d097277b9c6b2a1f (diff) | |
| parent | 382225e62bdb8059b7f915b133426425516dd300 (diff) | |
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) | |||
| 87 | $(obj)/bin2hex pss_synth < $< > $@ | 87 | $(obj)/bin2hex pss_synth < $< > $@ |
| 88 | else | 88 | else |
| 89 | $(obj)/pss_boot.h: | 89 | $(obj)/pss_boot.h: |
| 90 | ( \ | 90 | $(Q)( \ |
| 91 | echo 'static unsigned char * pss_synth = NULL;'; \ | 91 | echo 'static unsigned char * pss_synth = NULL;'; \ |
| 92 | echo 'static int pss_synthLen = 0;'; \ | 92 | echo 'static int pss_synthLen = 0;'; \ |
| 93 | ) > $@ | 93 | ) > $@ |
| @@ -102,7 +102,7 @@ ifeq ($(CONFIG_TRIX_HAVE_BOOT),y) | |||
| 102 | $(obj)/hex2hex -i trix_boot < $< > $@ | 102 | $(obj)/hex2hex -i trix_boot < $< > $@ |
| 103 | else | 103 | else |
| 104 | $(obj)/trix_boot.h: | 104 | $(obj)/trix_boot.h: |
| 105 | ( \ | 105 | $(Q)( \ |
| 106 | echo 'static unsigned char * trix_boot = NULL;'; \ | 106 | echo 'static unsigned char * trix_boot = NULL;'; \ |
| 107 | echo 'static int trix_boot_len = 0;'; \ | 107 | echo 'static int trix_boot_len = 0;'; \ |
| 108 | ) > $@ | 108 | ) > $@ |