commit 6d79468dd8537530f4150e76ed9b4b63f80571c6
author Mauro Carvalho Chehab <mchehab@infradead.org> Sat Jan 05 09:57:31 2008 -0300
committer Mauro Carvalho Chehab <mchehab@infradead.org> Fri Jan 25 19:04:32 2008 -0200
tree f785aeeec131c092b334e458127eb44fcf4ded2d
parent 1a6f11e0e8db9e76ef34bc6731d5291e4df1ba37

V4L/DVB (6951): Integrates em28xx-audio.c into em28xx kernel module

Also fixes the remaining CodingStyle issues that Lindent didn't fix.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

drivers/media/video/em28xx/Makefile

diff --git a/drivers/media/video/em28xx/Makefile b/drivers/media/video/em28xx/Makefile
index 7e7a93d..0924550 100644
--- a/drivers/media/video/em28xx/Makefile
+++ b/drivers/media/video/em28xx/Makefile
@@ -1,7 +1,10 @@
 em28xx-objs     := em28xx-video.o em28xx-i2c.o em28xx-cards.o em28xx-core.o \
 		   em28xx-input.o
 
+em28xx-alsa-objs := em28xx-audio.o
+
 obj-$(CONFIG_VIDEO_EM28XX) += em28xx.o
+obj-$(CONFIG_VIDEO_EM28XX_ALSA) += em28xx-alsa.o
 
 EXTRA_CFLAGS += -Idrivers/media/video
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core