Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[pandora-kernel.git] / drivers / media / dvb / dm1105 / dm1105.c

diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index b762e56..5d404f1 100644 (file)
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -594,7 +594,7 @@ static irqreturn_t dm1105_irq(int irq, void *dev_id)
 int __devinit dm1105_ir_init(struct dm1105_dev *dm1105)
 {
        struct input_dev *input_dev;
-       char *ir_codes = NULL;
+       char *ir_codes = RC_MAP_DM1105_NEC;
        int err = -ENOMEM;
 
        input_dev = input_allocate_device();
@@ -862,7 +862,6 @@ static int __devinit dm1105_probe(struct pci_dev *pdev,
        i2c_set_adapdata(&dev->i2c_adap, dev);
        strcpy(dev->i2c_adap.name, DRIVER_NAME);
        dev->i2c_adap.owner = THIS_MODULE;
-       dev->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
        dev->i2c_adap.dev.parent = &pdev->dev;
        dev->i2c_adap.algo = &dm1105_algo;
        dev->i2c_adap.algo_data = dev;