diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /sound/sh/Makefile | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'sound/sh/Makefile')
| -rw-r--r-- | sound/sh/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/sh/Makefile b/sound/sh/Makefile index 8fdcb6e26f00..7d09b5188cf7 100644 --- a/sound/sh/Makefile +++ b/sound/sh/Makefile | |||
| @@ -3,6 +3,8 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | snd-aica-objs := aica.o | 5 | snd-aica-objs := aica.o |
| 6 | snd-sh_dac_audio-objs := sh_dac_audio.o | ||
| 6 | 7 | ||
| 7 | # Toplevel Module Dependency | 8 | # Toplevel Module Dependency |
| 8 | obj-$(CONFIG_SND_AICA) += snd-aica.o | 9 | obj-$(CONFIG_SND_AICA) += snd-aica.o |
| 10 | obj-$(CONFIG_SND_SH_DAC_AUDIO) += snd-sh_dac_audio.o | ||