If you have one 1099-R for both things when you are asked what you did with the distribution you can choose the mixed option then you will be able to split out what went where. Follow the screen instructions carefully.
