Computer Science also includes lots of digital circutry and electrical engineering stuff. I am an undergrad right now majoring in computer science, and doing reaserch in the area of computer architecture (which is ALL digital/analog hardware).
I will be graduating this spring and will be going to graduate school, where I will be doing my reaserch full time. Computer Science is NOT just programming as many people think.