Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[linux-2.6-block.git] / drivers / media / platform / atmel / Makefile
1 obj-$(CONFIG_VIDEO_ATMEL_ISC) += atmel-isc.o
2 obj-$(CONFIG_VIDEO_ATMEL_ISI) += atmel-isi.o