diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-05 07:57:31 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:04:32 -0500 |
commit | 6d79468dd8537530f4150e76ed9b4b63f80571c6 (patch) | |
tree | f785aeeec131c092b334e458127eb44fcf4ded2d /drivers/media/video/em28xx/Makefile | |
parent | 1a6f11e0e8db9e76ef34bc6731d5291e4df1ba37 (diff) |
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>
Diffstat (limited to 'drivers/media/video/em28xx/Makefile')
-rw-r--r-- | drivers/media/video/em28xx/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/Makefile b/drivers/media/video/em28xx/Makefile index 7e7a93d75c34..0924550992d0 100644 --- a/drivers/media/video/em28xx/Makefile +++ b/drivers/media/video/em28xx/Makefile | |||
@@ -1,7 +1,10 @@ | |||
1 | em28xx-objs := em28xx-video.o em28xx-i2c.o em28xx-cards.o em28xx-core.o \ | 1 | em28xx-objs := em28xx-video.o em28xx-i2c.o em28xx-cards.o em28xx-core.o \ |
2 | em28xx-input.o | 2 | em28xx-input.o |
3 | 3 | ||
4 | em28xx-alsa-objs := em28xx-audio.o | ||
5 | |||
4 | obj-$(CONFIG_VIDEO_EM28XX) += em28xx.o | 6 | obj-$(CONFIG_VIDEO_EM28XX) += em28xx.o |
7 | obj-$(CONFIG_VIDEO_EM28XX_ALSA) += em28xx-alsa.o | ||
5 | 8 | ||
6 | EXTRA_CFLAGS += -Idrivers/media/video | 9 | EXTRA_CFLAGS += -Idrivers/media/video |
7 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 10 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core |