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/oss/Makefile | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'sound/oss/Makefile')
| -rw-r--r-- | sound/oss/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/oss/Makefile b/sound/oss/Makefile index e0ae4d4d6a5c..567b8a74178a 100644 --- a/sound/oss/Makefile +++ b/sound/oss/Makefile | |||
| @@ -13,7 +13,6 @@ obj-$(CONFIG_SOUND_SH_DAC_AUDIO) += sh_dac_audio.o | |||
| 13 | obj-$(CONFIG_SOUND_AEDSP16) += aedsp16.o | 13 | obj-$(CONFIG_SOUND_AEDSP16) += aedsp16.o |
| 14 | obj-$(CONFIG_SOUND_PSS) += pss.o ad1848.o mpu401.o | 14 | obj-$(CONFIG_SOUND_PSS) += pss.o ad1848.o mpu401.o |
| 15 | obj-$(CONFIG_SOUND_TRIX) += trix.o ad1848.o sb_lib.o uart401.o | 15 | obj-$(CONFIG_SOUND_TRIX) += trix.o ad1848.o sb_lib.o uart401.o |
| 16 | obj-$(CONFIG_SOUND_SSCAPE) += sscape.o ad1848.o mpu401.o | ||
| 17 | obj-$(CONFIG_SOUND_MSS) += ad1848.o | 16 | obj-$(CONFIG_SOUND_MSS) += ad1848.o |
| 18 | obj-$(CONFIG_SOUND_PAS) += pas2.o sb.o sb_lib.o uart401.o | 17 | obj-$(CONFIG_SOUND_PAS) += pas2.o sb.o sb_lib.o uart401.o |
| 19 | obj-$(CONFIG_SOUND_SB) += sb.o sb_lib.o uart401.o | 18 | obj-$(CONFIG_SOUND_SB) += sb.o sb_lib.o uart401.o |