strscpy(info.type, "ir_video", I2C_NAME_SIZE);
                pvr2_trace(PVR2_TRACE_INFO, "Binding %s to i2c address 0x%02x.",
                           info.type, info.addr);
-               i2c_new_device(&hdw->i2c_adap, &info);
+               i2c_new_client_device(&hdw->i2c_adap, &info);
                break;
        case PVR2_IR_SCHEME_ZILOG:     /* HVR-1950 style */
        case PVR2_IR_SCHEME_24XXX_MCE: /* 24xxx MCE device */
                strscpy(info.type, "ir_z8f0811_haup", I2C_NAME_SIZE);
                pvr2_trace(PVR2_TRACE_INFO, "Binding %s to i2c address 0x%02x.",
                           info.type, info.addr);
-               i2c_new_device(&hdw->i2c_adap, &info);
+               i2c_new_client_device(&hdw->i2c_adap, &info);
                break;
        default:
                /* The device either doesn't support I2C-based IR or we