Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6
[cascardo/linux.git] / drivers / media / usb / usbtv / Makefile
1 obj-$(CONFIG_VIDEO_USBTV) += usbtv.o