diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-05-22 10:01:29 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-05-22 10:01:29 +0200 |
commit | 02e5fbf622aabf68bdc02282a17a3aeed054237a (patch) | |
tree | 60f2d4e09464dbf338c832bb39f861f29779b86b /sound/i2c/other/Makefile | |
parent | b759b3ac9aee3afb01c21b603970ebb200c8048e (diff) | |
parent | bfe9fc8aebc997ce8bcf8ac0586c84a247812064 (diff) | |
download | blackbird-op-linux-02e5fbf622aabf68bdc02282a17a3aeed054237a.tar.gz blackbird-op-linux-02e5fbf622aabf68bdc02282a17a3aeed054237a.zip |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/i2c/other/Makefile')
-rw-r--r-- | sound/i2c/other/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/i2c/other/Makefile b/sound/i2c/other/Makefile index 2dad40f3f622..c95d8f1aae87 100644 --- a/sound/i2c/other/Makefile +++ b/sound/i2c/other/Makefile @@ -14,4 +14,4 @@ snd-tea575x-tuner-objs := tea575x-tuner.o obj-$(CONFIG_SND_PDAUDIOCF) += snd-ak4117.o obj-$(CONFIG_SND_ICE1712) += snd-ak4xxx-adda.o obj-$(CONFIG_SND_ICE1724) += snd-ak4114.o snd-ak4113.o snd-ak4xxx-adda.o snd-pt2258.o -obj-$(CONFIG_SND_FM801_TEA575X) += snd-tea575x-tuner.o +obj-$(CONFIG_SND_TEA575X) += snd-tea575x-tuner.o |