diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-26 09:52:54 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-26 09:52:54 -0500 |
| commit | 7f50548abb5454bd82c25aae15f0a3bf6a530f46 (patch) | |
| tree | 175b5d695437151f0f9f778ad8eb7f274468842f /sound/oss/Makefile | |
| parent | b3172f222ab5afdc91ea058bd11c42cf169728f3 (diff) | |
| parent | 6b7b284958d47b77d06745b36bc7f36dab769d9b (diff) | |
Merge commit 'v2.6.33-rc2' into for-2.6.33
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 |