Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[~andy/linux] / drivers / media / video / em28xx / em28xx-i2c.c

diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index a88e169dba23b74b15c710d88d23fd38e414680e..185db65b766ef5b58ab2f124d3c20491e8aaceeb 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -553,9 +553,6 @@ int em28xx_i2c_register(struct em28xx *dev)
        if (i2c_scan)
                em28xx_do_i2c_scan(dev);
 
-       /* Instantiate the IR receiver device, if present */
-       em28xx_register_i2c_ir(dev);
-
        return 0;
 }