This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/v4l-dvb.git tree:
Subject: ir-sysfs: Better handle merge conflict Author: Mauro Carvalho Chehab <[email protected]> Date: Mon Jul 5 17:22:16 2010 -0300 Signed-off-by: Mauro Carvalho Chehab <[email protected]> drivers/media/IR/ir-sysfs.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) --- http://git.linuxtv.org/v4l-dvb.git?a=commitdiff;h=9b17ff10d120ebdd07f5950b450cf2947f5504fb diff --git a/drivers/media/IR/ir-sysfs.c b/drivers/media/IR/ir-sysfs.c index 5d1ac7d..a841e51 100644 --- a/drivers/media/IR/ir-sysfs.c +++ b/drivers/media/IR/ir-sysfs.c @@ -277,11 +277,7 @@ int ir_register_class(struct input_dev *input_dev) if (unlikely(devno < 0)) return devno; - if (ir_dev->props) { - if (ir_dev->props->driver_type == RC_DRIVER_SCANCODE) - ir_dev->dev.type = &rc_dev_type; - } else - ir_dev->dev.type = &ir_raw_dev_type; + ir_dev->dev.type = &rc_dev_type; ir_dev->dev.class = &ir_input_class; ir_dev->dev.parent = input_dev->dev.parent; dev_set_name(&ir_dev->dev, "rc%d", devno); _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
