diff options
author | James Morris <jmorris@namei.org> | 2009-03-26 22:28:11 +0100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-03-26 22:28:11 +0100 |
commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /sound/i2c/Makefile | |
parent | smack: convert smack to standard linux lists (diff) | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
download | linux-1987f17d2266e882862528841429b5bf67bc8fe5.tar.xz linux-1987f17d2266e882862528841429b5bf67bc8fe5.zip |
Merge branch 'master' into next
Diffstat (limited to 'sound/i2c/Makefile')
-rw-r--r-- | sound/i2c/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/i2c/Makefile b/sound/i2c/Makefile index 37970666a453..36879bf88700 100644 --- a/sound/i2c/Makefile +++ b/sound/i2c/Makefile @@ -7,8 +7,6 @@ snd-i2c-objs := i2c.o snd-cs8427-objs := cs8427.o snd-tea6330t-objs := tea6330t.o -obj-$(CONFIG_L3) += l3/ - obj-$(CONFIG_SND) += other/ # Toplevel Module Dependency |