diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-27 04:40:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-27 04:40:08 -0700 |
| commit | 15d3b4a26291c170563e2b25ded5de1324f93959 (patch) | |
| tree | 9bea548a7de5215c58a091d58f4eefdb92349f2c /sound/oss/Makefile | |
| parent | 2c3abab7c95295f319dc8899b74cbd60140fcdfb (diff) | |
| parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'sound/oss/Makefile')
| -rw-r--r-- | sound/oss/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/oss/Makefile b/sound/oss/Makefile index 1f86299fae40..c611514f7ff1 100644 --- a/sound/oss/Makefile +++ b/sound/oss/Makefile @@ -29,11 +29,8 @@ obj-$(CONFIG_SOUND_MSNDCLAS) += msnd.o msnd_classic.o obj-$(CONFIG_SOUND_MSNDPIN) += msnd.o msnd_pinnacle.o obj-$(CONFIG_SOUND_VWSND) += vwsnd.o obj-$(CONFIG_SOUND_AU1550_AC97) += au1550_ac97.o ac97_codec.o -obj-$(CONFIG_SOUND_TRIDENT) += trident.o ac97_codec.o obj-$(CONFIG_SOUND_BCM_CS4297A) += swarm_cs4297a.o -obj-$(CONFIG_SOUND_WM97XX) += ac97_plugin_wm97xx.o - obj-$(CONFIG_DMASOUND) += dmasound/ # Declare multi-part drivers. |