A savant, by definition, is somebody who has a disability and, along with that disability, has some remarkable ability. Prodigies and geniuses have the remarkable abilities that the savant shows, but they do not have a disability. So, by definition, a savant includes someone with a disability, and a prodigy or genius are people who have these remarkable skills but they do not have a disability.
