diff options
author | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-11-03 14:11:27 +0000 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-11-03 14:11:27 +0000 |
commit | 8f987768eb99631374f4ab0bb19cd062baf1397d (patch) | |
tree | b89aa5c207f7ba6a688f45657424b937f17ceb8a /sound/oss/Makefile | |
parent | 63f7526f26f0a9291ac3f7a986aa18ebfb61ec19 (diff) | |
parent | c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 (diff) | |
download | op-kernel-dev-8f987768eb99631374f4ab0bb19cd062baf1397d.zip op-kernel-dev-8f987768eb99631374f4ab0bb19cd062baf1397d.tar.gz |
Merge commit 'v2.6.37-rc1' into for-2.6.37
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 567b8a7..96f14dc 100644 --- a/sound/oss/Makefile +++ b/sound/oss/Makefile @@ -9,7 +9,6 @@ obj-$(CONFIG_SOUND_OSS) += sound.o # Please leave it as is, cause the link order is significant ! -obj-$(CONFIG_SOUND_SH_DAC_AUDIO) += sh_dac_audio.o obj-$(CONFIG_SOUND_AEDSP16) += aedsp16.o obj-$(CONFIG_SOUND_PSS) += pss.o ad1848.o mpu401.o obj-$(CONFIG_SOUND_TRIX) += trix.o ad1848.o sb_lib.o uart401.o |