Many people think of diversity in terms of race and ethnicity. I would go further in including any component of human identity that influences (or is influenced by) power relations. This could include, but is not limited to, things such as sexual orientation, gender, geography, skin color (as separate from race), etc. You might call this a "postmodern" definition of diversity.