aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/Makefile
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-12-11 09:10:16 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-11 09:10:16 -0200
commit3c91560bf96a1f7ad39131e7730fd319647ff734 (patch)
treec48b8d3f06af2f6ed04efc916b1624892ccc543b /drivers/media/rc/Makefile
parentaf4c52a75b2ffd0ad7514acc681759d2e44a5d46 (diff)
parentdedb94adebe0fbdd9cafdbb170337810d8638bc9 (diff)
Merge /home/v4l/v4l/patchwork
* /home/v4l/v4l/patchwork: [media] timblogiw: Fix a merge conflict with v4l2_i2c_new_subdev_board changes [media] timblogiw: const and __devinitdata do not mix [media] gspca/sn9c20x: Fix support for mt9m001 (mi1300) sensor [media] gspca core: Fix regressions gspca breaking devices with audio [media] gspca/sn9c20x: Get rid of scale "magic" numbers [media] gspca/sn9c20x: Test if sensor is a OV sensor [media] keycodes for DSR-0112 remote bundled with Haupauge MiniStick [media] media: Remove unnecessary casts of usb_get_intfdata [media] Terratec Cinergy Hybrid T USB XS [media] media: rc: lirc_dev: check kobject_set_name() result [media] rc-core: add loopback driver
Diffstat (limited to 'drivers/media/rc/Makefile')
-rw-r--r--drivers/media/rc/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 78ac8c5c8adc..67b4f7fe2577 100644
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -19,3 +19,4 @@ obj-$(CONFIG_IR_NUVOTON) += nuvoton-cir.o
obj-$(CONFIG_IR_ENE) += ene_ir.o
obj-$(CONFIG_IR_STREAMZAP) += streamzap.o
obj-$(CONFIG_IR_WINBOND_CIR) += winbond-cir.o
+obj-$(CONFIG_RC_LOOPBACK) += rc-loopback.o

Privacy Policy