git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
cx23885
/
Makefile
diff --git
a/drivers/media/video/cx23885/Makefile
b/drivers/media/video/cx23885/Makefile
index
e2ee95f
..
23293c7
100644
(file)
--- a/
drivers/media/video/cx23885/Makefile
+++ b/
drivers/media/video/cx23885/Makefile
@@
-5,6
+5,7
@@
cx23885-objs := cx23885-cards.o cx23885-video.o cx23885-vbi.o \
cx23885-f300.o
obj-$(CONFIG_VIDEO_CX23885) += cx23885.o
+obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o
EXTRA_CFLAGS += -Idrivers/media/video
EXTRA_CFLAGS += -Idrivers/media/common/tuners